@asterai/cli 0.3.1 → 0.3.2

package/README.md

@@ -20,7 +20,7 @@ $ npm install -g @asterai/cli
 $ asterai COMMAND
 running command...
 $ asterai (--version)
-@asterai/cli/0.3.1 linux-x64 node-v20.12.2
+@asterai/cli/0.3.2 linux-x64 node-v20.12.2
 $ asterai --help [COMMAND]
 USAGE
   $ asterai COMMAND
@@ -53,7 +53,7 @@ EXAMPLES
   $ asterai auth
 ```
 
-_See code: [src/commands/auth.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.1/src/commands/auth.ts)_
+_See code: [src/commands/auth.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.2/src/commands/auth.ts)_
 
 ## `asterai build [INPUT]`
 
@@ -73,7 +73,7 @@ EXAMPLES
   $ asterai build
 ```
 
-_See code: [src/commands/build.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.1/src/commands/build.ts)_
+_See code: [src/commands/build.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.2/src/commands/build.ts)_
 
 ## `asterai codegen`
 
@@ -97,7 +97,7 @@ EXAMPLES
   $ asterai codegen
 ```
 
-_See code: [src/commands/codegen.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.1/src/commands/codegen.ts)_
+_See code: [src/commands/codegen.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.2/src/commands/codegen.ts)_
 
 ## `asterai deploy [INPUT]`
 
@@ -120,7 +120,7 @@ EXAMPLES
   $ asterai deploy --app 66a46b12-b1a7-4b72-a64a-0e4fe21902b6
 ```
 
-_See code: [src/commands/deploy.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.1/src/commands/deploy.ts)_
+_See code: [src/commands/deploy.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.2/src/commands/deploy.ts)_
 
 ## `asterai help [COMMAND]`
 
@@ -157,5 +157,5 @@ EXAMPLES
   $ asterai init project-name
 ```
 
-_See code: [src/commands/init.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.1/src/commands/init.ts)_
+_See code: [src/commands/init.ts](https://github.com/asterai-io/asterai-sdk/blob/v0.3.2/src/commands/init.ts)_
 <!-- commandsstop -->

package/dist/commands/codegen.js

@@ -60,9 +60,9 @@ export const codegen = (flags) => {
     if (flags.appId && flags.language) {
         return generateClientTypings(outDir, flags.language, flags.appId, flags.staging ?? false);
     }
-    return generateAssemblyScriptPluginTypings(outDir, baseDir, manifestPath);
+    return generateAssemblyScriptPluginTypings(flags, baseDir);
 };
-const generateAssemblyScriptPluginTypings = async (outDir, baseDir, manifestPath) => {
+const generateAssemblyScriptPluginTypings = async (flags, baseDir) => {
     const absoluteAsProtoGenPath = path.join(baseDir, AS_PROTO_GEN_PATH);
     try {
         execSync("protoc --version");
@@ -77,7 +77,7 @@ const generateAssemblyScriptPluginTypings = async (outDir, baseDir, manifestPath
         execSync("protoc " +
             `--plugin='protoc-gen-as=${absoluteAsProtoGenPath}' ` +
             `--experimental_allow_proto3_optional ` +
-            `--as_out='./${outDir}' ./${manifestPath}`);
+            `--as_out='./${flags.outputDir}' ./${flags.manifest}`);
     }
     catch (e) {
         console.error("Failed to generate protobuf types:", e);
@@ -96,32 +96,43 @@ const deleteOldGeneratedFiles = (outDir) => {
 };
 const generateClientTypings = async (outDir, language, appId, shouldUseStaging) => {
     const manifestsResponse = await downloadEnabledPluginsManifests(appId, shouldUseStaging);
-    fs.writeFileSync(path.join(outDir, "manifests.json"), JSON.stringify(manifestsResponse, null, 2));
-    console.log("manifests.json generated successfully.");
+    const asteraiProto = await fetchAsteraiProto();
+    const aggregatedManifest = aggregateManifests(manifestsResponse.manifests, asteraiProto);
+    const appPrefix = `app.${appId}`;
+    fs.writeFileSync(path.join(outDir, `${appPrefix}.proto`), aggregatedManifest.content);
     if (language === "ts") {
-        const aggregatedManifestPath = aggregateManifests(manifestsResponse.manifests);
+        console.log("generating TypeScript typings for plugin manifest...");
+        const jsOutput = `${appPrefix}.js`;
+        const dTsOutput = `${appPrefix}.d.ts`;
         execSync(`
-      npx -p protobufjs-cli pbjs -t static --no-service ${aggregatedManifestPath} -o ${path.join(outDir, "plugins.asterai.js")}
+      npx -p protobufjs-cli pbjs -t static --no-service ${aggregatedManifest.filePath} -o ${path.join(outDir, jsOutput)}
     `);
         execSync(`
-      npx -p protobufjs-cli pbts -o ${path.join(outDir, "plugins.asterai.d.ts")} ${path.join(outDir, "plugins.asterai.js")}
+      npx -p protobufjs-cli pbts -o ${path.join(outDir, dTsOutput)} ${path.join(outDir, jsOutput)}
     `);
-        fs.unlinkSync(aggregatedManifestPath);
+        fs.unlinkSync(aggregatedManifest.filePath);
         console.log("Typings generated successfully.");
     }
+    console.log("done.");
 };
-const aggregateManifests = (manifests) => {
-    let aggregatedManifest = `
-  syntax = 'proto3';
-  \n
-`;
+const fetchAsteraiProto = () => {
+    // TODO: fetch this from the local file system instead.
+    return axios
+        .get("https://unpkg.com/@asterai/sdk@latest/protobuf/asterai.proto")
+        .then(r => r.data);
+};
+const aggregateManifests = (manifests, asteraiProto) => {
+    let aggregatedManifest = `${asteraiProto}\n`;
     const osTmpDir = os.tmpdir();
     const aggregatedManifestPath = path.join(osTmpDir, "plugins.asterai.proto");
     for (const manifest of manifests) {
         aggregatedManifest += `${manifest.proto}\n`;
     }
     fs.writeFileSync(aggregatedManifestPath, aggregatedManifest);
-    return aggregatedManifestPath;
+    return {
+        content: aggregatedManifest,
+        filePath: aggregatedManifestPath,
+    };
 };
 const downloadEnabledPluginsManifests = async (appId, shouldUseStaging) => {
     const baseUrl = shouldUseStaging

package/oclif.manifest.json

@@ -225,5 +225,5 @@
       ]
     }
   },
-  "version": "0.3.1"
+  "version": "0.3.2"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@asterai/cli",
   "description": "CLI for building and deploying asterai plugins",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "author": "asterai <support@asterai.io>",
   "repository": "asterai-io/asterai-sdk",
   "homepage": "https://github.com/asterai-io/asterai-sdk",