blokctl 0.2.5 → 0.2.8

package/dist/commands/create/project.js

@@ -16,7 +16,7 @@ const exec = util.promisify(child_process.exec);
 const HOME_DIR = `${os.homedir()}/.blok`;
 const GITHUB_REPO_LOCAL = `${HOME_DIR}/blok`;
 const GITHUB_REPO_REMOTE = "https://github.com/well-prado/blok.git";
-const GITHUB_REPO_RELEASE_TAG = "v0.0.1-beta.5";
+const GITHUB_REPO_RELEASE_TAG = "v0.2.2";
 fsExtra.ensureDirSync(HOME_DIR);
 const options = {
     baseDir: HOME_DIR,
@@ -312,6 +312,7 @@ export async function createProject(opts, version, currentPath = false, localRep
             const triggerDestDir = `${dirPath}/src/triggers/${triggerKind}`;
             fixRunnerImportPaths(triggerDestDir, triggerKind);
         }
+        replaceBlokImportsInDirectory(`${dirPath}/src`);
         const sharedNodesContent = generateSharedNodesFile(selectedTriggers, repoSource);
         fsExtra.writeFileSync(`${dirPath}/src/Nodes.ts`, sharedNodesContent);
         const sharedWorkflowsContent = generateSharedWorkflowsFile(selectedTriggers);
@@ -789,6 +790,24 @@ if (process.env.DISABLE_TRIGGER_RUN !== "true") {
 console.log("${triggerKind} trigger not yet implemented");
 `;
 }
+function replaceBlokImportsInDirectory(dirPath) {
+    const files = fsExtra.readdirSync(dirPath, { withFileTypes: true });
+    for (const file of files) {
+        const fullPath = path.join(dirPath, file.name);
+        if (file.isDirectory()) {
+            if (file.name !== "node_modules" && file.name !== ".blok") {
+                replaceBlokImportsInDirectory(fullPath);
+            }
+        }
+        else if (file.name.endsWith(".ts") || file.name.endsWith(".tsx")) {
+            let content = fsExtra.readFileSync(fullPath, "utf8");
+            if (content.includes("@blok/")) {
+                content = content.replace(/@blok\//g, "@blokjs/");
+                fsExtra.writeFileSync(fullPath, content);
+            }
+        }
+    }
+}
 function fixRunnerImportPaths(triggerDestDir, triggerKind) {
     const filesToFix = [];
     if (triggerKind === "http") {
@@ -840,7 +859,7 @@ function updatePubSubProvider(triggerDestDir, provider) {
     const config = adapterConfigs[provider];
     if (!config)
         return;
-    content = content.replace(/import \{ PubSubTrigger, \w+ \} from "@blok\/trigger-pubsub";/, `import { PubSubTrigger, ${config.importName} } from "@blokjs/trigger-pubsub";`);
+    content = content.replace(/import \{ (\w+), (\w+) \} from ["']@blokjs\/trigger-pubsub["'];/, `import { ${config.importName}, PubSubTrigger } from "@blokjs/trigger-pubsub";`);
     content = content.replace(/(export default class \w+ extends PubSubTrigger \{[\s\S]*?)\n\tprotected adapter = new \w+\(\{[\s\S]*?\}\);/, `$1\n\tprotected adapter = ${config.init};`);
     fsExtra.writeFileSync(serverPath, content);
 }
@@ -880,7 +899,7 @@ function updateQueueProvider(triggerDestDir, provider) {
     const config = adapterConfigs[provider];
     if (!config)
         return;
-    content = content.replace(/import \{ QueueTrigger, \w+ \} from "@blok\/trigger-queue";/, `import { QueueTrigger, ${config.importName} } from "@blokjs/trigger-queue";`);
+    content = content.replace(/import \{ (\w+), (\w+) \} from ["']@blokjs\/trigger-queue["'];/, `import { ${config.importName}, QueueTrigger } from "@blokjs/trigger-queue";`);
     content = content.replace(/(export default class \w+ extends QueueTrigger \{[\s\S]*?)\n\tprotected adapter = new \w+\(\{[\s\S]*?\}\);/, `$1\n\tprotected adapter = ${config.init};`);
     fsExtra.writeFileSync(serverPath, content);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "blokctl",
-	"version": "0.2.5",
+	"version": "0.2.8",
 	"author": "Deskree Technologies Inc.",
 	"license": "Apache-2.0",
 	"description": "cli for blok",