Update for standalone base environments

plugins/importer-insomnia/src/index.ts

@@ -1,4 +1,4 @@
-import { Environment, Folder, GrpcRequest, HttpRequest, Workspace, Context } from '@yaakapp/api';
+import { Context, Environment, Folder, GrpcRequest, HttpRequest, Workspace } from '@yaakapp/api';
 import YAML from 'yaml';
 
 type AtLeast<T, K extends keyof T> = Partial<T> & Pick<T, K>;
@@ -16,11 +16,13 @@ export function pluginHookImport(ctx: Context, contents: string) {
 
   try {
     parsed = JSON.parse(contents);
-  } catch (e) {}
+  } catch (e) {
+  }
 
   try {
     parsed = parsed ?? YAML.parse(contents);
-  } catch (e) { }
+  } catch (e) {
+  }
 
   if (!isJSObject(parsed)) return;
   if (!Array.isArray(parsed.resources)) return;
@@ -35,23 +37,20 @@ export function pluginHookImport(ctx: Context, contents: string) {
 
   // Import workspaces
   const workspacesToImport = parsed.resources.filter(isWorkspace);
-  for (const workspaceToImport of workspacesToImport) {
-    const baseEnvironment = parsed.resources.find(
-      (r: any) => isEnvironment(r) && r.parentId === workspaceToImport._id,
-    );
+  for (const w of workspacesToImport) {
     resources.workspaces.push({
-      id: convertId(workspaceToImport._id),
-      createdAt: new Date(workspacesToImport.created ?? Date.now()).toISOString().replace('Z', ''),
-      updatedAt: new Date(workspacesToImport.updated ?? Date.now()).toISOString().replace('Z', ''),
+      id: convertId(w._id),
+      createdAt: w.created ? new Date(w.created).toISOString().replace('Z', '') : undefined,
+      updatedAt: w.updated ? new Date(w.updated).toISOString().replace('Z', '') : undefined,
       model: 'workspace',
-      name: workspaceToImport.name,
-      variables: baseEnvironment ? parseVariables(baseEnvironment.data) : [],
+      name: w.name,
+      description: w.description || undefined,
     });
     const environmentsToImport = parsed.resources.filter(
-      (r: any) => isEnvironment(r) && r.parentId === baseEnvironment?._id,
+      (r: any) => isEnvironment(r),
     );
     resources.environments.push(
-      ...environmentsToImport.map((r: any) => importEnvironment(r, workspaceToImport._id)),
+      ...environmentsToImport.map((r: any) => importEnvironment(r, w._id)),
     );
 
     const nextFolder = (parentId: string) => {
@@ -59,22 +58,22 @@ export function pluginHookImport(ctx: Context, contents: string) {
       let sortPriority = 0;
       for (const child of children) {
         if (isRequestGroup(child)) {
-          resources.folders.push(importFolder(child, workspaceToImport._id));
+          resources.folders.push(importFolder(child, w._id));
           nextFolder(child._id);
         } else if (isHttpRequest(child)) {
           resources.httpRequests.push(
-            importHttpRequest(child, workspaceToImport._id, sortPriority++),
+            importHttpRequest(child, w._id, sortPriority++),
           );
         } else if (isGrpcRequest(child)) {
           resources.grpcRequests.push(
-            importGrpcRequest(child, workspaceToImport._id, sortPriority++),
+            importGrpcRequest(child, w._id, sortPriority++),
           );
         }
       }
     };
 
     // Import folders
-    nextFolder(workspaceToImport._id);
+    nextFolder(w._id);
   }
 
   // Filter out any `null` values
@@ -83,15 +82,16 @@ export function pluginHookImport(ctx: Context, contents: string) {
   resources.environments = resources.environments.filter(Boolean);
   resources.workspaces = resources.workspaces.filter(Boolean);
 
-  return { resources };
+  return { resources: deleteUndefinedAttrs(resources) };
 }
 
 function importEnvironment(e: any, workspaceId: string): ExportResources['environments'][0] {
   return {
     id: convertId(e._id),
-    createdAt: new Date(e.created ?? Date.now()).toISOString().replace('Z', ''),
-    updatedAt: new Date(e.updated ?? Date.now()).toISOString().replace('Z', ''),
+    createdAt: e.created ? new Date(e.created).toISOString().replace('Z', '') : undefined,
+    updatedAt: e.updated ? new Date(e.updated).toISOString().replace('Z', '') : undefined,
     workspaceId: convertId(workspaceId),
+    environmentId: e.parentId === workspaceId ? null : convertId(e.parentId),
     model: 'environment',
     name: e.name,
     variables: Object.entries(e.data).map(([name, value]) => ({
@@ -105,10 +105,11 @@ function importEnvironment(e: any, workspaceId: string): ExportResources['enviro
 function importFolder(f: any, workspaceId: string): ExportResources['folders'][0] {
   return {
     id: convertId(f._id),
-    createdAt: new Date(f.created ?? Date.now()).toISOString().replace('Z', ''),
-    updatedAt: new Date(f.updated ?? Date.now()).toISOString().replace('Z', ''),
+    createdAt: f.created ? new Date(f.created).toISOString().replace('Z', '') : undefined,
+    updatedAt: f.updated ? new Date(f.updated).toISOString().replace('Z', '') : undefined,
     folderId: f.parentId === workspaceId ? null : convertId(f.parentId),
     workspaceId: convertId(workspaceId),
+    description: f.description || undefined,
     model: 'folder',
     name: f.name,
   };
@@ -125,13 +126,14 @@ function importGrpcRequest(
 
   return {
     id: convertId(r._id),
-    createdAt: new Date(r.created ?? Date.now()).toISOString().replace('Z', ''),
-    updatedAt: new Date(r.updated ?? Date.now()).toISOString().replace('Z', ''),
+    createdAt: r.created ? new Date(r.created).toISOString().replace('Z', '') : undefined,
+    updatedAt: r.updated ? new Date(r.updated).toISOString().replace('Z', '') : undefined,
     workspaceId: convertId(workspaceId),
     folderId: r.parentId === workspaceId ? null : convertId(r.parentId),
     model: 'grpc_request',
     sortPriority,
     name: r.name,
+    description: r.description || undefined,
     url: convertSyntax(r.url),
     service,
     method,
@@ -200,13 +202,14 @@ function importHttpRequest(
 
   return {
     id: convertId(r._id),
-    createdAt: new Date(r.created ?? Date.now()).toISOString().replace('Z', ''),
-    updatedAt: new Date(r.updated ?? Date.now()).toISOString().replace('Z', ''),
+    createdAt: r.created ? new Date(r.created).toISOString().replace('Z', '') : undefined,
+    updatedAt: r.updated ? new Date(r.updated).toISOString().replace('Z', '') : undefined,
     workspaceId: convertId(workspaceId),
     folderId: r.parentId === workspaceId ? null : convertId(r.parentId),
     model: 'http_request',
     sortPriority,
     name: r.name,
+    description: r.description || undefined,
     url: convertSyntax(r.url),
     body,
     bodyType,
@@ -223,14 +226,6 @@ function importHttpRequest(
   };
 }
 
-function parseVariables(data: Record<string, string>) {
-  return Object.entries(data).map(([name, value]) => ({
-    enabled: true,
-    name,
-    value: `${value}`,
-  }));
-}
-
 function convertSyntax(variable: string): string {
   if (!isJSString(variable)) return variable;
   return variable.replaceAll(/{{\s*(_\.)?([^}]+)\s*}}/g, '${[$2]}');
@@ -270,3 +265,17 @@ function convertId(id: string): string {
   }
   return `GENERATE_ID::${id}`;
 }
+
+function deleteUndefinedAttrs<T>(obj: T): T {
+  if (Array.isArray(obj) && obj != null) {
+    return obj.map(deleteUndefinedAttrs) as T;
+  } else if (typeof obj === 'object' && obj != null) {
+    return Object.fromEntries(
+      Object.entries(obj)
+        .filter(([, v]) => v !== undefined)
+        .map(([k, v]) => [k, deleteUndefinedAttrs(v)]),
+    ) as T;
+  } else {
+    return obj;
+  }
+}