@voxgig/model 0.16.0 → 0.18.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/voxgig-model +12 -2
- package/dist/lib/build.d.ts +1 -0
- package/dist/lib/build.js +3 -0
- package/dist/lib/build.js.map +1 -1
- package/dist/model.js +5 -2
- package/dist/model.js.map +1 -1
- package/lib/build.ts +5 -0
- package/model/sys.jsonic +19 -19
- package/model.ts +6 -2
- package/package.json +5 -5
package/bin/voxgig-model
CHANGED
|
@@ -5,6 +5,7 @@ const Path = require('path')
|
|
|
5
5
|
|
|
6
6
|
let { Model } = require('../dist/model.js')
|
|
7
7
|
|
|
8
|
+
|
|
8
9
|
let path = process.argv[2]
|
|
9
10
|
let once = '--once' === process.argv[3]
|
|
10
11
|
|
|
@@ -22,11 +23,20 @@ if (fstats.isFile()) {
|
|
|
22
23
|
}
|
|
23
24
|
|
|
24
25
|
path = Path.resolve(path)
|
|
25
|
-
console.log('PATH', path)
|
|
26
|
+
// console.log('PATH', path)
|
|
26
27
|
|
|
27
28
|
let src = Fs.readFileSync(path).toString()
|
|
28
29
|
|
|
29
|
-
let
|
|
30
|
+
let spec = {
|
|
31
|
+
src,
|
|
32
|
+
path,
|
|
33
|
+
base,
|
|
34
|
+
require: process.cwd()
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
// console.log('CMD SPEC', spec)
|
|
38
|
+
|
|
39
|
+
let model = new Model(spec)
|
|
30
40
|
|
|
31
41
|
|
|
32
42
|
async function run() {
|
package/dist/lib/build.d.ts
CHANGED
package/dist/lib/build.js
CHANGED
package/dist/lib/build.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../lib/build.ts"],"names":[],"mappings":";;;AAEA,iCAAuC;
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../lib/build.ts"],"names":[],"mappings":";;;AAEA,iCAAuC;AAiCvC,MAAM,KAAK;IAWT,YAAY,IAAU;QAPtB,SAAI,GAAQ,WAAG,CAAC,IAAI,EAAE,CAAA;QAKtB,QAAG,GAA4B,EAAE,CAAA;QAG/B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;QACnB,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;QAC9C,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;QAC9C,IAAI,CAAC,IAAI,GAAG,EAAE,CAAA;QAEd,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;YACrB,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;SAC3B;QAED,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;SACjC;QAED,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,EAAE,CAAA;QAEzB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,CAAA;IACzC,CAAC;IAGD,KAAK,CAAC,GAAG;QACP,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,IAAI,EAAE,GAAG,MAAM,CAAC,CAAA;QAExD,IAAI,CAAC,IAAI,GAAG,IAAA,aAAK,EAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;QAEtC,IAAI,GAAG,GAAI,IAAI,CAAC,IAAY,CAAA;QAC5B,OAAO,CAAC,GAAG,CAAC,SAAS,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;QAEnD,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACjB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;YACxB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;SAC5C;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;QAG5B,4CAA4C;QAC5C,IAAI,KAAK,GAAG,EAAE,CAAA;QACd,KAAK,IAAI,OAAO,IAAI,IAAI,CAAC,GAAG,EAAE;YAC5B,IAAI,EAAE,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAClC,EAAE,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAA;YACtB,EAAE,CAAC,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAA;YAC/B,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;SACf;QAED,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAA;IACnD,CAAC;CACF;AAIC,sBAAK"}
|
package/dist/model.js
CHANGED
|
@@ -18,6 +18,7 @@ const intern = makeIntern();
|
|
|
18
18
|
class Model {
|
|
19
19
|
constructor(spec) {
|
|
20
20
|
this.trigger_model = false;
|
|
21
|
+
console.log('MODEL SPEC', spec);
|
|
21
22
|
this.config = intern.makeConfig(spec, {
|
|
22
23
|
path: '/',
|
|
23
24
|
build: async (build) => {
|
|
@@ -50,7 +51,8 @@ class Model {
|
|
|
50
51
|
path: '/',
|
|
51
52
|
build: local_1.local_builder
|
|
52
53
|
}
|
|
53
|
-
]
|
|
54
|
+
],
|
|
55
|
+
require: spec.require
|
|
54
56
|
};
|
|
55
57
|
this.watch = new watch_1.Watch(this.build);
|
|
56
58
|
}
|
|
@@ -88,7 +90,8 @@ function makeIntern() {
|
|
|
88
90
|
build: model_1.model_builder
|
|
89
91
|
},
|
|
90
92
|
trigger_model_build
|
|
91
|
-
]
|
|
93
|
+
],
|
|
94
|
+
require: spec.require
|
|
92
95
|
};
|
|
93
96
|
return new config_1.Config(cspec);
|
|
94
97
|
}
|
package/dist/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../model.ts"],"names":[],"mappings":";AAAA,oDAAoD;;;;;;AAEpD,6BAA6B;AAC7B,4CAAmB;AAEnB,yCAAqC;AAErC,uCAAmC;AAEnC,+CAAmD;AACnD,+CAAmD;AAEnD,qCAGmB;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../model.ts"],"names":[],"mappings":"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"}
|
package/lib/build.ts
CHANGED
|
@@ -26,6 +26,7 @@ interface Spec {
|
|
|
26
26
|
path?: string
|
|
27
27
|
base?: string
|
|
28
28
|
res?: BuildAction[]
|
|
29
|
+
require?: any
|
|
29
30
|
use?: { [name: string]: any }
|
|
30
31
|
}
|
|
31
32
|
|
|
@@ -54,6 +55,10 @@ class Build {
|
|
|
54
55
|
this.opts.base = spec.base
|
|
55
56
|
}
|
|
56
57
|
|
|
58
|
+
if (null != spec.require) {
|
|
59
|
+
this.opts.require = spec.require
|
|
60
|
+
}
|
|
61
|
+
|
|
57
62
|
this.res = spec.res || []
|
|
58
63
|
|
|
59
64
|
Object.assign(this.use, spec.use || {})
|
package/model/sys.jsonic
CHANGED
|
@@ -56,28 +56,28 @@ shape: part: img: {
|
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
|
|
59
|
-
app: web: basic: .sys.shape.app
|
|
59
|
+
# app: web: basic: .sys.shape.app
|
|
60
60
|
|
|
61
|
-
app: web: basic: {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
}
|
|
61
|
+
# app: web: basic: {
|
|
62
|
+
# name: basic
|
|
63
|
+
# layout: BasicAdmin
|
|
64
|
+
# }
|
|
65
65
|
|
|
66
|
-
app: web: basic: parts: {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
66
|
+
# app: web: basic: parts: {
|
|
67
|
+
# head: {
|
|
68
|
+
# part: BasicHead
|
|
69
|
+
# }
|
|
70
70
|
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
71
|
+
# side: {
|
|
72
|
+
# part: BasicSide
|
|
73
|
+
# }
|
|
74
74
|
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
75
|
+
# main: {
|
|
76
|
+
# part: BasicMain
|
|
77
|
+
# }
|
|
78
78
|
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
}
|
|
79
|
+
# foot: {
|
|
80
|
+
# part: BasicFoot
|
|
81
|
+
# }
|
|
82
|
+
# }
|
|
83
83
|
|
package/model.ts
CHANGED
|
@@ -27,6 +27,8 @@ class Model {
|
|
|
27
27
|
|
|
28
28
|
|
|
29
29
|
constructor(spec: Spec) {
|
|
30
|
+
console.log('MODEL SPEC', spec)
|
|
31
|
+
|
|
30
32
|
this.config = intern.makeConfig(spec, {
|
|
31
33
|
path: '/',
|
|
32
34
|
build: async (build: Build) => {
|
|
@@ -67,7 +69,8 @@ class Model {
|
|
|
67
69
|
path: '/',
|
|
68
70
|
build: local_builder
|
|
69
71
|
}
|
|
70
|
-
]
|
|
72
|
+
],
|
|
73
|
+
require: spec.require
|
|
71
74
|
}
|
|
72
75
|
|
|
73
76
|
this.watch = new Watch(this.build)
|
|
@@ -115,7 +118,8 @@ function makeIntern() {
|
|
|
115
118
|
},
|
|
116
119
|
|
|
117
120
|
trigger_model_build
|
|
118
|
-
]
|
|
121
|
+
],
|
|
122
|
+
require: spec.require
|
|
119
123
|
}
|
|
120
124
|
|
|
121
125
|
return new Config(cspec)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@voxgig/model",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.18.0",
|
|
4
4
|
"main": "dist/model.js",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"types": "dist/model.d.ts",
|
|
@@ -42,15 +42,15 @@
|
|
|
42
42
|
"LICENSE"
|
|
43
43
|
],
|
|
44
44
|
"dependencies": {
|
|
45
|
-
"aontu": "0.
|
|
45
|
+
"aontu": "0.12.0",
|
|
46
46
|
"chokidar": "3.5.3"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
|
-
"@types/jest": "^29.
|
|
50
|
-
"esbuild": "^0.17.
|
|
49
|
+
"@types/jest": "^29.5.0",
|
|
50
|
+
"esbuild": "^0.17.12",
|
|
51
51
|
"esbuild-jest": "^0.5.0",
|
|
52
52
|
"jest": "^29.5.0",
|
|
53
53
|
"es-jest": "^2.1.0",
|
|
54
|
-
"typescript": "^
|
|
54
|
+
"typescript": "^5.0.2"
|
|
55
55
|
}
|
|
56
56
|
}
|