@voxgig/model 0.0.11 → 0.1.0

package/dist/lib/builder/model.js

@@ -5,7 +5,6 @@ const promises_1 = require("fs/promises");
 const model_builder = async (build) => {
     let json = JSON.stringify(build.root.gen(), null, 2);
     let file = build.opts.base + '/model.json';
-    // console.log('MODEL OUT', file, json)
     await (0, promises_1.writeFile)(file, json);
     return { ok: true };
 };

package/dist/lib/builder/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../lib/builder/model.ts"],"names":[],"mappings":";;;AACA,0CAAuC;AAKvC,MAAM,aAAa,GAAY,KAAK,EAAE,KAAY,EAAE,EAAE;IAEpD,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IAEpD,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,aAAa,CAAA;IAE1C,uCAAuC;IAEvC,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAE3B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAA;AACrB,CAAC,CAAA;AAGC,sCAAa"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../lib/builder/model.ts"],"names":[],"mappings":";;;AACA,0CAAuC;AAKvC,MAAM,aAAa,GAAY,KAAK,EAAE,KAAY,EAAE,EAAE;IAEpD,IAAI,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IAEpD,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,aAAa,CAAA;IAE1C,MAAM,IAAA,oBAAS,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAE3B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAA;AACrB,CAAC,CAAA;AAGC,sCAAa"}

package/lib/builder/model.ts

@@ -10,8 +10,6 @@ const model_builder: Builder = async (build: Build) => {
 
   let file = build.opts.base + '/model.json'
 
-  // console.log('MODEL OUT', file, json)
-
   await writeFile(file, json)
 
   return { ok: true }

package/model/sys.jsonic

@@ -1,63 +1,73 @@
 
-shape: app: {
-  name: string
-  layout: string
-  parts: {
-    &={
-      part: string
-      active: boolean
-      # active: *true | boolean
-    }
+shape: srv: {
+  env: {
+    lambda: boolean
   }
 }
 
-shape: part: img: {
-  src: string
-  svg: string
-}
 
-  
-app: web: basic: /sys/shape/app
 
-app: web: basic: {
-  name: basic
-  layout: BasicAdmin
-}
-
-app: web: basic: parts: {
-  head: {
-    part: BasicHead
-  }
 
-  side: {
-    part: BasicSide
-  }
 
-  main: {
-    part: BasicMain
-  }
+# shape: app: {
+#   name: string
+#   layout: string
+#   # parts: {
+#   #   &={
+#   #     part: string
+#   #     active: boolean
+#   #     # active: *true | boolean
+#   #   }
+#   # }
+# }
 
-  foot: {
-    part: BasicFoot
-  }
-}
+# shape: part: img: {
+#   src: string
+#   svg: string
+# }
 
-#app: web: basic: parts: head: {
-#   part: BasicHead
-#   logo: /sys/shape/part/img 
-#}
+  
+# app: web: basic: /sys/shape/app
 
-# app: web: basic: parts: side: {
-# #  part: BasicSide
-# #   # menu: /shape/part/menu
+# app: web: basic: {
+#   name: basic
+#   layout: BasicAdmin
 # }
 
-# app: web: basic: parts: main: {
-#   part: BasicMain
-# }
+# app: web: basic: parts: {
+#   head: {
+#     part: BasicHead
+#   }
+
+#   side: {
+#     part: BasicSide
+#   }
+
+#   main: {
+#     part: BasicMain
+#   }
 
-# app: web: basic: parts: foot: {
-#   part: BasicFoot
+#   foot: {
+#     part: BasicFoot
+#   }
 # }
+
+# #app: web: basic: parts: head: {
+# #   part: BasicHead
+# #   logo: /sys/shape/part/img 
+# #}
+
+# # app: web: basic: parts: side: {
+# # #  part: BasicSide
+# # #   # menu: /shape/part/menu
+# # }
+
+# # app: web: basic: parts: main: {
+# #   part: BasicMain
+# # }
+
+# # app: web: basic: parts: foot: {
+# #   part: BasicFoot
+# # }
   
 

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@voxgig/model",
-  "version": "0.0.11",
+  "version": "0.1.0",
   "main": "dist/model.js",
   "type": "commonjs",
-  "browser": "dist/model.min.js",
   "types": "dist/model.d.ts",
   "bin": {
     "voxgig-model": "bin/voxgig-model"
@@ -11,6 +10,7 @@
   "description": "Voxgig Model.",
   "homepage": "https://github.com/voxgig/model",
   "keywords": [
+    "voxgig",
     "model"
   ],
   "author": "Richard Rodger (http://richardrodger.com)",
@@ -19,14 +19,12 @@
     "url": "git://github.com/voxgig/model.git"
   },
   "scripts": {
+    "test": "jest --coverage",
+    "test-pure": "jest --coverage --config jest.config.pure.js",
+    "test-some": "jest -t",
+    "test-watch": "jest --coverage --watchAll",
     "watch": "tsc -w -d",
-    "test": "lab -v -P test -t 50 --sourcemaps --transform node_modules/lab-transform-typescript -r console -o stdout -r html -o test/coverage.html",
-    "test-some": "lab -v -P test --sourcemaps --transform node_modules/lab-transform-typescript -g",
-    "test-jest": "jest --coverage",
-    "test-web": "echo no-test-web",
-    "test-web-x": "browserify -o test-web/test-web.js -e test/model.test.js -s Model -im -i assert -i @hapi/lab && open test-web/index.html",
-    "build-x": "tsc -d && cp dist/model.js dist/model.min.js && browserify -o dist/model.min.js -e dist/model.js -s Model -im -i assert -p tinyify",
-    "build": "tsc -d && cp dist/model.js dist/model.min.js",
+    "build": "tsc -d",
     "clean": "rm -rf node_modules yarn.lock package-lock.json",
     "reset": "npm run clean && npm i && npm run build && npm test",
     "repo-tag": "REPO_VERSION=`node -e \"console.log(require('./package').version)\"` && echo TAG: v$REPO_VERSION && git commit -a -m v$REPO_VERSION && git push && git tag v$REPO_VERSION && git push --tags;",
@@ -48,12 +46,10 @@
   },
   "devDependencies": {
     "@types/jest": "^27.5.1",
+    "esbuild": "^0.14.39",
+    "esbuild-jest": "^0.5.0",
     "jest": "^28.1.0",
-    "tinyify": "^3.0.0",
     "ts-jest": "^28.0.2",
-    "typescript": "^4.6.4",
-    "@hapi/code": "^9.0.0",
-    "@hapi/lab": "^25.0.1",
-    "lab-transform-typescript": "^3.0.1"
+    "typescript": "^4.6.4"
   }
 }