@scaffscript/core 0.1.6 → 0.2.0

package/dist/index.cjs

@@ -110,12 +110,7 @@ async function parseArgs(...args) {
   switch (cmd) {
     case "gen":
     case "generate":
-      const path3 = args[1];
-      if (!path3) {
-        log.error("No source path specified. Please specify a valid source path. Aborting...");
-        return null;
-      }
-      const yypPath = args[2];
+      const yypPath = args[1];
       if (!yypPath) {
         log.error("No project path specified. Please specify a valid project path. Aborting...");
         return null;
@@ -123,6 +118,15 @@ async function parseArgs(...args) {
         log.error(`Invalid project path: \x1B[33m${yypPath}\x1B[0m. Please specify a valid \x1B[32m.yyp\x1B[0m file. Aborting...`);
         return null;
       }
+      const optionList = [...args].slice(2);
+      const options = {
+        integrate: optionList.includes("-i") || optionList.includes("--integrate"),
+        noIntegration: optionList.includes("-!i") || optionList.includes("--no-integration")
+      };
+      if (options.integrate && options.noIntegration) {
+        log.error("Cannot specify both \x1B[33m--integrate\x1B[0m and \x1B[33m--no-integrate\x1B[0m. Aborting...");
+        return null;
+      }
       const exists = await fileExists(normalizePath(resolvePath(yypPath)));
       if (!exists) {
         log.error(`Project path \x1B[33m${yypPath}\x1B[0m not found. Aborting...`);
@@ -130,7 +134,7 @@ async function parseArgs(...args) {
       }
       return {
         cmd: "generate",
-        scanPath: normalizePath(resolvePath(path3)),
+        options,
         projectPath: normalizePath(resolvePath(yypPath))
       };
     case "help":
@@ -295,10 +299,11 @@ async function getScaffConfig() {
     debugLevel: conf.debugLevel ?? 0,
     integrationOption: conf.integrationOption ?? {},
     noBackup: conf.noBackup ?? false,
-    noIntegration: conf.noIntegration ?? false,
+    noIntegration: conf.noIntegration ?? true,
     onNotFound: conf.onNotFound ?? "error",
     path: conf.path ?? {},
     production: conf.production ?? false,
+    source: conf.source ?? "./src",
     tabType: conf.tabType ?? "1t",
     targetPlatform: conf.targetPlatform ?? "all",
     useGmAssetPath: conf.useGmAssetPath ?? false
@@ -335,7 +340,7 @@ function getTabLevels(str, tabType) {
 // package.json
 var package_default = {
   name: "@scaffscript/core",
-  version: "0.1.5",
+  version: "0.1.6",
   repository: {
     type: "git",
     url: "https://github.com/undervolta/scaffscript"
@@ -369,7 +374,8 @@ var package_default = {
     "build:node": "bun build src/index-node.ts --outfile dist/index.cjs --target node --format cjs",
     "build:bun": "bun build src/index-bun.ts --outfile build/index.mjs --target bun --format esm",
     "build:all": "bun run build:node && bun run build:bun",
-    dev: "bun run src/index-node.ts"
+    dev: "bun run src/index-node.ts",
+    prelink: "bun run build"
   },
   type: "module"
 };
@@ -441,6 +447,7 @@ async function readAndSplitFiles(files, config) {
       continue;
     }
     const matchExport = [...file.content.matchAll(modControlRegex)];
+    implRegex.lastIndex = 0;
     if (matchExport.length)
       exports2.push({ file, depth: file.path.split("/").filter(Boolean).length });
     else if (implRegex.test(file.content))
@@ -455,6 +462,7 @@ async function readAndSplitFiles(files, config) {
   exports2.sort((a, b) => b.depth - a.depth);
   indexes.sort((a, b) => b.depth - a.depth);
   for (const fileHandle of exports2) {
+    implRegex.lastIndex = 0;
     if (implRegex.test(fileHandle.file.content))
       implFiles.push(fileHandle.file);
     else if (fileHandle.file.isScaff && fileHandle.file.toGenerate)
@@ -463,6 +471,7 @@ async function readAndSplitFiles(files, config) {
       res.scaff.push(fileHandle.file);
   }
   for (const fileHandle of indexes) {
+    implRegex.lastIndex = 0;
     if (implRegex.test(fileHandle.file.content))
       implFiles.push(fileHandle.file);
     else if (fileHandle.file.isScaff && fileHandle.file.toGenerate)
@@ -831,14 +840,14 @@ ${insertTabs(1, config.tabType)}${classBody}
               const parsedStr = `${name} = function(${params.combined.join(", ")}) ${arrowBlock}`;
               if (!module2[filePath])
                 module2[filePath] = {};
-              module2[filePath][name] = { name, value: arrowBlock.slice(1, -1), type: "method", parsedStr };
+              module2[filePath][name] = { name, value: arrowBlock.slice(1, -1), type: "arrow-fn", parsedStr };
             } else {
               const params = parseFnParams(valuePart);
               const body = valuePart.split("=>")[1].trim();
               const parsedStr = `${name} = function(${params.combined.join(", ")}) { return ${body}; }`;
               if (!module2[filePath])
                 module2[filePath] = {};
-              module2[filePath][name] = { name, value: body, type: "method", parsedStr };
+              module2[filePath][name] = { name, value: body, type: "arrow-fn", parsedStr };
             }
           } else if (valuePart.startsWith("function")) {
             if (valuePart.trim().endsWith("{")) {
@@ -879,7 +888,7 @@ ${insertTabs(1, config.tabType)}${classBody}
             if (!module2[filePath])
               module2[filePath] = {};
             const parsedStr = varType !== "const" ? `${varType === "let" ? "" : "var "}${name} = ${valuePart};` : `#macro ${name} ${valuePart}`;
-            module2[filePath][name] = { name, value: valuePart, type: valueType, parsedStr };
+            module2[filePath][name] = { name, value: valuePart, type: varType === "const" ? "constant" : "variable", parsedStr };
           }
         }
       }
@@ -976,7 +985,7 @@ function implementClass(module2, fileGroup, config) {
     if (file.childs.length > 0)
       file.childs.forEach((child) => toImpl.push({ parent: file, file: child }));
   }
-  for (const fileImpl of toImpl) {
+  for (const [idx, fileImpl] of toImpl.entries()) {
     const filePath = fileImpl.parent.isIndex ? fileImpl.parent.path : `${fileImpl.parent.path}/${fileImpl.parent.name}`;
     const match = parseHeader(fileImpl.file.content);
     for (const m of match) {
@@ -987,9 +996,11 @@ function implementClass(module2, fileGroup, config) {
       if (!className || !body)
         continue;
       module2[filePath][className].parsedStr = module2[filePath][className].parsedStr.slice(0, -1) + `${body.replace(`
-`, "")}
+`, "")}` + (idx < toImpl.length - 1 ? `
+
+` : `
 }
-`;
+`);
     }
   }
   return true;
@@ -1573,6 +1584,7 @@ function getEventFile(eventInput, numInput) {
       dynNum = true;
       break;
     case "keydown":
+    case "key_down":
     case "keyboard":
       event = 5 /* KEY_DOWN */;
       break;
@@ -1580,18 +1592,22 @@ function getEventFile(eventInput, numInput) {
       event = 6 /* MOUSE */;
       break;
     case "other":
+    case "async":
       event = 7 /* OTHER */;
       break;
     case "draw":
       event = 8 /* DRAW */;
       break;
     case "keypress":
+    case "key_press":
       event = 9 /* KEY_PRESS */;
       break;
     case "keyrelease":
+    case "key_release":
       event = 10 /* KEY_RELEASE */;
       break;
     case "cleanup":
+    case "clean_up":
       event = 12 /* CLEAN_UP */;
       break;
     case "gesture":
@@ -1928,7 +1944,7 @@ function createYYScript(projectYyp, rescName, dir, options) {
   "name":"${rescName}",
   "parent":{
     "name":"${dir !== "" ? dirSplit.pop() : projectYyp.replace(".yyp", "")}",
-    "path":"${dir !== "" ? `folders/${dir}.yy` : projectYyp}",
+    "path":"${dir !== "" ? `folders/${dir}.yy` : `${projectYyp}.yyp`}",
   },
   "resourceType":"GMScript",
   "resourceVersion":"2.0",
@@ -1949,7 +1965,7 @@ function createYYObject(projectYyp, rescName, dir, eventList, options) {
   "overriddenProperties":[],
   "parent":{
     "name":"${dir !== "" ? dirSplit.pop() : projectYyp.replace(".yyp", "")}",
-    "path":"${dir !== "" ? `folders/${dir}.yy` : projectYyp}",
+    "path":"${dir !== "" ? `folders/${dir}.yy` : `${projectYyp}.yyp`}",
   },
   "parentObjectId":null,
   "persistent":false,
@@ -2090,9 +2106,9 @@ async function modifyYyProject(type, projectPath, resource = null, folder = null
   if (type === "add") {
     let addedFolderCnt = 0;
     if (toAddFolders) {
-      const folderStartIdx = rawLines.findIndex((line) => line.includes("Folders"));
-      const folderEndIdx = rawLines.findIndex((line, idx) => idx > folderStartIdx && line.includes("]"));
-      const existsFolders = rawLines.slice(folderStartIdx + 1, folderEndIdx);
+      let folderStartIdx = rawLines.findIndex((line) => line.includes("Folders"));
+      let folderEndIdx = rawLines.findIndex((line, idx) => idx >= folderStartIdx && line.includes("]"));
+      const existsFolders = folderEndIdx > folderStartIdx ? rawLines.slice(folderStartIdx + 1, folderEndIdx) : [];
       for (const folderDir of toAddFolders) {
         const folderSplit = folderDir.split("/");
         for (let i = 0;i < folderSplit.length; i++) {
@@ -2103,6 +2119,11 @@ async function modifyYyProject(type, projectPath, resource = null, folder = null
           name = name.slice(0, -1);
           const dupe = existsFolders.find((line) => line.includes(`"%Name":"${name}"`));
           if (!dupe) {
+            if (!existsFolders.length) {
+              rawLines[folderStartIdx] = '  "Folders":[';
+              rawLines.splice(folderStartIdx + 1, 0, "  ],");
+              folderEndIdx = folderStartIdx + 1;
+            }
             rawLines.splice(folderEndIdx + addedFolderCnt, 0, createGMFolderStr(name));
             addedFolderCnt++;
           }
@@ -2176,7 +2197,8 @@ async function integrateSourceCodes(genFile, config, projectPath) {
         log.debug(`File \x1B[32m${relPath}\x1B[0m not found. Creating new resource...`);
         const { type, name } = await createGMResource(gmProject, path3, data, config.integrationOption);
         if (type && name) {
-          newFolders.push(data.dirPath);
+          if (data.dirPath !== "")
+            newFolders.push(data.dirPath);
           newResources.push(createGMResourceStr(type, name));
           data.isNew = true;
         }
@@ -2243,7 +2265,7 @@ async function main() {
     case "generate":
       log.debug("Getting Scaff config...");
       const config = await getScaffConfig();
-      const files = await getScaffFiles(resolvePath(input.scanPath));
+      const files = await getScaffFiles(resolvePath(config.source));
       log.debug("Processing files...");
       const fileGroup = await readAndSplitFiles(files, config);
       if (!fileGroup) {
@@ -2280,7 +2302,7 @@ async function main() {
       }, []);
       log.debug("Integration data extracted successfully.");
       const genFiles = await generateSourceCode(intgData, config, input.projectPath);
-      if (!config.noIntegration) {
+      if (!config.noIntegration && !input.options.noIntegration) {
         log.debug("Integrating source code...");
         const modified = await integrateSourceCodes(genFiles, config, input.projectPath);
         if (modified === null) {
@@ -2295,7 +2317,10 @@ async function main() {
           log.info("Program executed successfully. Thanks for using ScaffScript!");
       } else {
         console.log("---");
-        log.info("\x1B[34mnoIntegration\x1B[0m flag is set to \x1B[33mtrue\x1B[0m in the \x1B[32mscaff.config\x1B[0m. No source code will be integrated. Thanks for using ScaffScript!");
+        if (input.options.noIntegration)
+          log.info("\x1B[34m--no-integration\x1B[0m option is set. No source code will be integrated. Thanks for using ScaffScript!");
+        else
+          log.info("\x1B[34mnoIntegration\x1B[0m flag is set to \x1B[33mtrue\x1B[0m in the \x1B[32mscaff.config\x1B[0m. No source code will be integrated. Thanks for using ScaffScript!");
       }
       console.log("");
       break;

package/dist/index.d.ts

@@ -47,7 +47,12 @@ export type ScaffConfig = {
 	/**
      * whether the script is running in production mode (default = false)
      */
-	production: boolean;							
+	production: boolean;
+	
+	/**
+     * source directory (default = "./src")
+     */
+	source: string;
 	
 	/**
      * tab type to use when generating source code (default = "1t")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scaffscript/core",
-  "version": "0.1.6",
+  "version": "0.2.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/undervolta/scaffscript"
@@ -34,7 +34,8 @@
     "build:node": "bun build src/index-node.ts --outfile dist/index.cjs --target node --format cjs",
     "build:bun": "bun build src/index-bun.ts --outfile build/index.mjs --target bun --format esm",
     "build:all": "bun run build:node && bun run build:bun",
-    "dev": "bun run src/index-node.ts"
+    "dev": "bun run src/index-node.ts",
+    "prelink": "bun run build"
   },
   "type": "module"
 }