@uniformdev/cli 18.24.1-alpha.1 → 18.26.0

package/dist/index.mjs

@@ -88,6 +88,15 @@ import { existsSync, mkdirSync } from "fs";
 import { readdir, unlink } from "fs/promises";
 import { extname as extname2, join } from "path";
 
+// src/util.ts
+var omit = (object, keys) => {
+  const result = keys.reduce((current, key) => {
+    const { [key]: _, ...rest } = current;
+    return rest;
+  }, object);
+  return result;
+};
+
 // src/sync/util.ts
 import { readFileSync, writeFileSync } from "fs";
 import httpsProxyAgent from "https-proxy-agent";
@@ -189,6 +198,10 @@ function emitWithFormat(object, format, filename) {
       break;
     case "yaml":
       content = dump(object);
+      if ("$schema" in object) {
+        content = `# yaml-language-server: $schema=<${object["$schema"]}>
+${content}`;
+      }
       break;
     default:
       throw new Error(`Unsupported format: ${format}`);
@@ -222,7 +235,8 @@ async function createFileSyncEngineDataSource({
   format = "yaml",
   selectIdentifier: selectIdentifier11,
   selectDisplayName: selectDisplayName11 = selectIdentifier11,
-  selectFilename: selectFilename2
+  selectFilename: selectFilename2,
+  selectSchemaUrl: selectSchemaUrl2
 }) {
   const dirExists = existsSync(directory);
   if (!dirExists) {
@@ -245,7 +259,7 @@ async function createFileSyncEngineDataSource({
           id: selectIdentifier11(contents),
           displayName: selectDisplayName11(contents),
           providerId: fullFilename,
-          object: contents
+          object: omit(contents, ["$schema"])
         };
         yield object;
       } catch (e) {
@@ -261,11 +275,15 @@ ${e == null ? void 0 : e.message}`));
       await unlink(providerId);
     },
     writeObject: async (object) => {
-      if (selectFilename2) {
-        emitWithFormat(object.object, format, join(directory, `${selectFilename2(object.object)}.${format}`));
-      } else {
-        emitWithFormat(object.object, format, getFullFilename(object.id));
+      const filename = selectFilename2 ? join(directory, `${selectFilename2(object.object)}.${format}`) : getFullFilename(object.id);
+      let contents = object.object;
+      if (selectSchemaUrl2) {
+        contents = {
+          $schema: selectSchemaUrl2(object.object),
+          ...object.object
+        };
       }
+      emitWithFormat(contents, format, filename);
     }
   };
 }
@@ -440,6 +458,11 @@ function createSyncEngineConsoleLogger(options) {
   };
 }
 
+// src/commands/canvas/commands/component/_util.ts
+var selectIdentifier = (component) => component.id;
+var selectDisplayName = (component) => `${component.name} (pid: ${component.id})`;
+var selectSchemaUrl = () => "/schemas/json-schema/component-definition/v1.json";
+
 // src/commands/canvas/commands/component/get.ts
 var ComponentGetModule = {
   command: "get <id>",
@@ -459,7 +482,14 @@ var ComponentGetModule = {
       console.error("Component did not exist");
       process.exit(1);
     } else {
-      emitWithFormat(res.componentDefinitions[0], format, filename);
+      emitWithFormat(
+        {
+          $schema: new URL(selectSchemaUrl(), apiHost).toString(),
+          ...res.componentDefinitions[0]
+        },
+        format,
+        filename
+      );
     }
   }
 };
@@ -491,10 +521,6 @@ var ComponentListModule = {
 // src/commands/canvas/commands/component/pull.ts
 import { UncachedCanvasClient as UncachedCanvasClient3 } from "@uniformdev/canvas";
 
-// src/commands/canvas/commands/component/_util.ts
-var selectIdentifier = (component) => component.id;
-var selectDisplayName = (component) => `${component.name} (pid: ${component.id})`;
-
 // src/commands/canvas/componentDefinitionEngineDataSource.ts
 function createComponentDefinitionEngineDataSource({
   client
@@ -740,6 +766,7 @@ var ComponentPullModule = {
         directory,
         selectIdentifier,
         selectDisplayName,
+        selectSchemaUrl: () => new URL(selectSchemaUrl(), apiHost).toString(),
         format
       });
     }
@@ -804,7 +831,8 @@ var ComponentPushModule = {
       source = await createFileSyncEngineDataSource({
         directory,
         selectIdentifier,
-        selectDisplayName
+        selectDisplayName,
+        selectSchemaUrl
       });
     }
     const target = createComponentDefinitionEngineDataSource({ client });
@@ -3162,7 +3190,7 @@ import { PostHog } from "posthog-node";
 // package.json
 var package_default = {
   name: "@uniformdev/cli",
-  version: "18.24.0",
+  version: "18.26.0",
   description: "Uniform command line interface tool",
   license: "SEE LICENSE IN LICENSE.txt",
   main: "./cli.js",
@@ -3208,8 +3236,8 @@ var package_default = {
     "@types/js-yaml": "4.0.5",
     "@types/jsonwebtoken": "9.0.1",
     "@types/lodash.isequalwith": "4.4.7",
-    "@types/node": "18.15.2",
-    "@types/yargs": "17.0.22",
+    "@types/node": "18.15.5",
+    "@types/yargs": "17.0.23",
     "p-limit": "4.0.0"
   },
   bin: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "18.24.1-alpha.1+65e77b560",
+  "version": "18.26.0",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -16,9 +16,9 @@
     "format": "prettier --write \"src/**/*.{js,ts,tsx}\""
   },
   "dependencies": {
-    "@uniformdev/canvas": "18.24.1-alpha.1+65e77b560",
-    "@uniformdev/context": "18.24.1-alpha.1+65e77b560",
-    "@uniformdev/project-map": "18.24.1-alpha.1+65e77b560",
+    "@uniformdev/canvas": "18.26.0",
+    "@uniformdev/context": "18.26.0",
+    "@uniformdev/project-map": "18.26.0",
     "chalk": "^5.2.0",
     "diff": "^5.0.0",
     "dotenv": "^16.0.3",
@@ -46,8 +46,8 @@
     "@types/js-yaml": "4.0.5",
     "@types/jsonwebtoken": "9.0.1",
     "@types/lodash.isequalwith": "4.4.7",
-    "@types/node": "18.15.2",
-    "@types/yargs": "17.0.22",
+    "@types/node": "18.15.5",
+    "@types/yargs": "17.0.23",
     "p-limit": "4.0.0"
   },
   "bin": {
@@ -59,5 +59,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "65e77b56039b0c688518358a8402acd84686e9e0"
+  "gitHead": "776654d5b12c24cf597acd66cde039d6b0111419"
 }