@voxgig/build 0.2.0 → 0.3.0

package/build.ts

@@ -12,19 +12,36 @@ const EnvLambda = {
 
     let content = Object
       .entries(model.main.srv)
-      .filter((entry: any) => entry[1].env?.lambda)
+      .filter((entry: any) => entry[1].env?.lambda?.active)
       .map((entry: any) => {
         const name = entry[0]
-        // const srv = entry[1]
-        return `${name}:
-  handler: src/handlers/${name}.handler
+        const srv = entry[1]
+
+        const lambda = srv.env.lambda
+        const handler = lambda.handler
+
+        let srvyml = `${name}:
+  handler: ${handler.path.prefix}${name}${handler.path.suffix}
   events:
-    - http:
-        path: "/api/public/${name}"
-        method: POST
-        cors: true
 `
-      }).join('\n\n')
+        const web = srv.api.web
+
+        console.log(web)
+
+        if (web.active) {
+          let prefix = web.path.prefix
+          let area = web.path.area
+          let method = web.method
+          let cors = web.cors.active ? 'true' : 'false'
+          srvyml += `    - http:
+        path: "${prefix}${area}${name}"
+        method: ${method}
+        cors: ${cors}
+`
+        }
+
+        return srvyml
+      }).join('\n\n\n')
 
     Fs.writeFileSync(srv_yml_path, content)
   },

package/dist/build.js

@@ -12,19 +12,31 @@ const EnvLambda = {
         let srv_yml_path = path_1.default.join(spec.folder, 'srv.yml');
         let content = Object
             .entries(model.main.srv)
-            .filter((entry) => { var _a; return (_a = entry[1].env) === null || _a === void 0 ? void 0 : _a.lambda; })
+            .filter((entry) => { var _a, _b; return (_b = (_a = entry[1].env) === null || _a === void 0 ? void 0 : _a.lambda) === null || _b === void 0 ? void 0 : _b.active; })
             .map((entry) => {
             const name = entry[0];
-            // const srv = entry[1]
-            return `${name}:
-  handler: src/handlers/${name}.handler
+            const srv = entry[1];
+            const lambda = srv.env.lambda;
+            const handler = lambda.handler;
+            let srvyml = `${name}:
+  handler: ${handler.path.prefix}${name}${handler.path.suffix}
   events:
-    - http:
-        path: "/api/public/${name}"
-        method: POST
-        cors: true
 `;
-        }).join('\n\n');
+            const web = srv.api.web;
+            console.log(web);
+            if (web.active) {
+                let prefix = web.path.prefix;
+                let area = web.path.area;
+                let method = web.method;
+                let cors = web.cors.active ? 'true' : 'false';
+                srvyml += `    - http:
+        path: "${prefix}${area}${name}"
+        method: ${method}
+        cors: ${cors}
+`;
+            }
+            return srvyml;
+        }).join('\n\n\n');
         fs_1.default.writeFileSync(srv_yml_path, content);
     },
     // Only create if does not exist

package/dist/build.js.map

@@ -1 +1 @@
-{"version":3,"file":"build.js","sourceRoot":"","sources":["../build.ts"],"names":[],"mappings":";AAAA,+CAA+C;;;;;;AAE/C,4CAAmB;AACnB,gDAAuB;AAEvB,MAAM,SAAS,GAAG;IAEhB,OAAO,EAAE,CAAC,KAAU,EAAE,IAErB,EAAE,EAAE;QACH,IAAI,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QAEpD,IAAI,OAAO,GAAG,MAAM;aACjB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;aACvB,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,WAAC,OAAA,MAAA,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,0CAAE,MAAM,CAAA,EAAA,CAAC;aAC5C,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE;YAClB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACrB,uBAAuB;YACvB,OAAO,GAAG,IAAI;0BACI,IAAI;;;6BAGD,IAAI;;;CAGhC,CAAA;QACK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAEjB,YAAE,CAAC,aAAa,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IACzC,CAAC;IAGD,gCAAgC;IAChC,WAAW,EAAE,CAAC,KAAU,EAAE,IAEzB,EAAE,EAAE;QACH,MAAM;aACH,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;aACvB,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,WAAC,OAAA,MAAA,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,0CAAE,MAAM,CAAA,EAAA,CAAC;aAC5C,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YACtB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACrB,uBAAuB;YACvB,IAAI,gBAAgB,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,KAAK,CAAC,CAAA;YAE3D,IAAI,OAAO,GAAG;;;;;;;;;CASrB,CAAA;YAEO,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;gBACpC,YAAE,CAAC,aAAa,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;aAC5C;QACH,CAAC,CAAC,CAAA;IACN,CAAC;CAEF,CAAA;AAGC,8BAAS"}
+{"version":3,"file":"build.js","sourceRoot":"","sources":["../build.ts"],"names":[],"mappings":";AAAA,+CAA+C;;;;;;AAE/C,4CAAmB;AACnB,gDAAuB;AAEvB,MAAM,SAAS,GAAG;IAEhB,OAAO,EAAE,CAAC,KAAU,EAAE,IAErB,EAAE,EAAE;QACH,IAAI,YAAY,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAA;QAEpD,IAAI,OAAO,GAAG,MAAM;aACjB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;aACvB,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,eAAC,OAAA,MAAA,MAAA,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,0CAAE,MAAM,0CAAE,MAAM,CAAA,EAAA,CAAC;aACpD,GAAG,CAAC,CAAC,KAAU,EAAE,EAAE;YAClB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACrB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YAEpB,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAA;YAC7B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;YAE9B,IAAI,MAAM,GAAG,GAAG,IAAI;aACf,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM;;CAE5D,CAAA;YACO,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAA;YAEvB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAEhB,IAAI,GAAG,CAAC,MAAM,EAAE;gBACd,IAAI,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAA;gBAC5B,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAA;gBACxB,IAAI,MAAM,GAAG,GAAG,CAAC,MAAM,CAAA;gBACvB,IAAI,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAA;gBAC7C,MAAM,IAAI;iBACH,MAAM,GAAG,IAAI,GAAG,IAAI;kBACnB,MAAM;gBACR,IAAI;CACnB,CAAA;aACQ;YAED,OAAO,MAAM,CAAA;QACf,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAEnB,YAAE,CAAC,aAAa,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;IACzC,CAAC;IAGD,gCAAgC;IAChC,WAAW,EAAE,CAAC,KAAU,EAAE,IAEzB,EAAE,EAAE;QACH,MAAM;aACH,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;aACvB,MAAM,CAAC,CAAC,KAAU,EAAE,EAAE,WAAC,OAAA,MAAA,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,0CAAE,MAAM,CAAA,EAAA,CAAC;aAC5C,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;YACtB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACrB,uBAAuB;YACvB,IAAI,gBAAgB,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,GAAG,KAAK,CAAC,CAAA;YAE3D,IAAI,OAAO,GAAG;;;;;;;;;CASrB,CAAA;YAEO,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;gBACpC,YAAE,CAAC,aAAa,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;aAC5C;QACH,CAAC,CAAC,CAAA;IACN,CAAC;CAEF,CAAA;AAGC,8BAAS"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voxgig/build",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "main": "dist/build.js",
   "type": "commonjs",
   "types": "dist/build.d.ts",
@@ -40,14 +40,14 @@
   ],
   "dependencies": {},
   "devDependencies": {
-    "@types/jest": "^27.5.1",
-    "@voxgig/model": "^0.2.0",
-    "@voxgig/system": "^0.2.0",
-    "esbuild": "^0.14.41",
+    "@types/jest": "^28.1.6",
+    "@voxgig/model": "^0.6.1",
+    "@voxgig/system": "^0.4.1",
+    "esbuild": "^0.14.53",
     "esbuild-jest": "^0.5.0",
-    "jest": "^28.1.0",
-    "tinyify": "^3.0.0",
-    "ts-jest": "^28.0.3",
-    "typescript": "^4.7.2"
+    "jest": "^28.1.3",
+    "tinyify": "^3.1.0",
+    "ts-jest": "^28.0.7",
+    "typescript": "^4.7.4"
   }
 }