@tremho/mist-lift 2.2.2 → 2.2.3

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/README.md CHANGED
@@ -64,6 +64,9 @@ To get started using MistLift, please see the [QuickStart Guide](https://github.
64
64
 
65
65
  ## Changelog
66
66
 
67
+ ### 2.2.3
68
+ - fixes problematic bug w/rt test, build, and package consistency.
69
+
67
70
  ### 2.2.2
68
71
  - updated docs and prompts regarding tap installation
69
72
  - addressed hanging issue on publish command
@@ -114,53 +114,65 @@ function buildFunctionModules(funcName, funcDir, buildPath, options) {
114
114
  return __awaiter(this, void 0, void 0, function* () {
115
115
  const announce = ac.blue.dim(`building ${funcName}...`);
116
116
  let announced = false;
117
- let fails = 0;
117
+ // let fails = 0
118
+ const statObj = {
119
+ fails: 0
120
+ };
118
121
  // let builds = 0
119
122
  let failFast = options.includes('--failfast');
120
123
  if (options.includes('--deferfail'))
121
124
  failFast = false;
122
125
  const all = [];
123
- (0, DirectoryUtils_1.recurseDirectory)(funcDir, (filepath, stats) => {
126
+ yield (0, DirectoryUtils_1.recurseDirectory)(funcDir, (filepath, stats) => {
124
127
  if (path.extname(filepath) === '.ts') {
125
128
  let relPath = filepath.substring(funcDir.length);
126
129
  relPath = relPath.substring(0, relPath.lastIndexOf(path.sep));
127
130
  const outDir = path.join(buildPath, relPath);
128
- if (!(fails > 0 && failFast)) {
131
+ if (!(statObj.fails > 0 && failFast)) {
129
132
  if ((0, fileCompare_1.isNewer)(filepath, outDir)) {
130
133
  if (!announced) {
131
134
  announced = true;
132
135
  console.log(announce);
133
136
  }
134
137
  // builds++
135
- all.push((0, executeCommand_1.executeCommand)('tsc', [
136
- '--esModuleInterop', 'true',
137
- '--target', 'ES2015',
138
- '--module', 'commonjs',
139
- '--lib', 'dom,es2015,scripthost,es2015.proxy',
140
- '--strict', 'true',
141
- '--noImplicitAny', 'false',
142
- '--skipLibCheck', 'true',
143
- '--forceConsistentCasingInFileNames', 'true',
144
- '--sourceMap', 'true',
145
- '--outdir', outDir,
146
- filepath
147
- ], '', true).then((result) => {
148
- if (result.retcode !== 0) {
149
- fails++;
150
- // console.log("error detected", fails)
151
- const now = new Date();
152
- fs.utimesSync(filepath, now, now); // touch file so it is not skipped next build
153
- }
154
- }));
138
+ if (!filepath.endsWith('test.ts')) {
139
+ // if(builds >= 16 && builds < 17) {
140
+ // console.warn('>> pushing to tsc ', {filepath, outDir})
141
+ all.push(buildFile(filepath, outDir, statObj));
142
+ // }
143
+ }
155
144
  }
156
145
  }
157
146
  }
158
- fails += doPostBuildSteps(funcDir, buildPath);
159
147
  return false;
160
148
  });
161
- return yield Promise.all(all).then(() => __awaiter(this, void 0, void 0, function* () {
162
- return fails;
163
- }));
149
+ statObj.fails += doPostBuildSteps(funcDir, buildPath);
150
+ yield Promise.all(all);
151
+ return statObj.fails;
152
+ });
153
+ }
154
+ function buildFile(filepath, outDir, statObj) {
155
+ return __awaiter(this, void 0, void 0, function* () {
156
+ const result = yield (0, executeCommand_1.executeCommand)('tsc', [
157
+ '--esModuleInterop', 'true',
158
+ '--target', 'ES2015',
159
+ '--module', 'commonjs',
160
+ '--lib', 'dom,es2015,scripthost,es2015.proxy',
161
+ '--strict', 'true',
162
+ '--noImplicitAny', 'false',
163
+ '--skipLibCheck', 'true',
164
+ '--forceConsistentCasingInFileNames', 'true',
165
+ '--sourceMap', 'true',
166
+ '--outdir', outDir,
167
+ filepath
168
+ ], '', true);
169
+ if (result.retcode !== 0) {
170
+ if (statObj !== null && statObj !== undefined)
171
+ statObj.fails++;
172
+ // console.log("error detected", fails)
173
+ const now = new Date();
174
+ fs.utimesSync(filepath, now, now); // touch file so it is not skipped next build
175
+ }
164
176
  });
165
177
  }
166
178
  // do the steps after the build (file copies, etc)
@@ -1 +1 @@
1
- {"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/commands/build.ts"],"names":[],"mappings":"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"}
@@ -51,19 +51,19 @@ function doTestAsync(args) {
51
51
  let ret = 0;
52
52
  for (const funcName of args) {
53
53
  const result = yield (0, executeCommand_1.executeCommand)('tap', [
54
- `build/functions/${funcName}/*.test.js`,
54
+ `functions/${funcName}/*.test.ts`,
55
55
  /*
56
- - base -- looks a lot like terse
57
- - terse -- pass/fail counts
58
- - min -- errors only
59
- - dot -- like min, but a dot per assert
60
- - silent
61
- - json
62
- - jsonstream
63
- - markdown
64
- - junit
65
- - tap
66
- */
56
+ - base -- looks a lot like terse
57
+ - terse -- pass/fail counts
58
+ - min -- errors only
59
+ - dot -- like min, but a dot per assert
60
+ - silent
61
+ - json
62
+ - jsonstream
63
+ - markdown
64
+ - junit
65
+ - tap
66
+ */
67
67
  '--reporter=base',
68
68
  '--color',
69
69
  '--passes',
@@ -1 +1 @@
1
- {"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/commands/test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAAsD;AACtD,mCAAsC;AACtC,qCAAyC;AACzC,gDAAiC;AAEjC,SAAsB,WAAW,CAAE,IAAc;;QAC/C,IAAI,CAAA,MAAM,IAAA,oBAAY,EAAC,IAAI,CAAC,MAAK,CAAC;YAAE,OAAO,CAAC,CAAA,CAAC,4BAA4B;QAEzE,IAAI,CAAC,CAAA,MAAM,IAAA,uBAAc,GAAE,CAAA,EAAE,CAAC;YAC5B,mCAAmC;YACnC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,8DAA8D,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAA;YACxI,OAAO,CAAC,CAAA;QACV,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;QACnC,IAAI,GAAG,GAAG,CAAC,CAAA;QACX,KAAK,MAAM,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAG,MAAM,IAAA,+BAAc,EAAC,KAAK,EAAE;gBACnC,mBAAmB,QAAQ,YAAY;gBACvC;;;;;;;;;;;mBAWG;gBACH,iBAAiB;gBACjB,SAAS;gBACT,UAAU;gBACV,wBAAwB;gBACxB,6BAA6B;aAEpC,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;YAEZ,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;gBACzB,GAAG,GAAG,MAAM,CAAC,OAAO,CAAA;gBACpB,MAAK;YACP,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;CAAA;AAxCD,kCAwCC"}
1
+ {"version":3,"file":"test.js","sourceRoot":"","sources":["../../src/commands/test.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAAsD;AACtD,mCAAsC;AACtC,qCAAyC;AACzC,gDAAiC;AAEjC,SAAsB,WAAW,CAAE,IAAc;;QAC/C,IAAI,CAAA,MAAM,IAAA,oBAAY,EAAC,IAAI,CAAC,MAAK,CAAC;YAAE,OAAO,CAAC,CAAA,CAAC,4BAA4B;QAEzE,IAAI,CAAC,CAAA,MAAM,IAAA,uBAAc,GAAE,CAAA,EAAE,CAAC;YAC5B,mCAAmC;YACnC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,8DAA8D,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAA;YACxI,OAAO,CAAC,CAAA;QACV,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;YAAE,IAAI,GAAG,CAAC,GAAG,CAAC,CAAA;QACnC,IAAI,GAAG,GAAG,CAAC,CAAA;QACX,KAAK,MAAM,QAAQ,IAAI,IAAI,EAAE,CAAC;YAC5B,MAAM,MAAM,GAAG,MAAM,IAAA,+BAAc,EAAC,KAAK,EAAE;gBACzC,aAAa,QAAQ,YAAY;gBACjC;;;;;;;;;;;yBAWS;gBACT,iBAAiB;gBACjB,SAAS;gBACT,UAAU;gBACV,wBAAwB;gBACxB,6BAA6B;aAE9B,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;YAEZ,IAAI,MAAM,CAAC,OAAO,KAAK,CAAC,EAAE,CAAC;gBACzB,GAAG,GAAG,MAAM,CAAC,OAAO,CAAA;gBACpB,MAAK;YACP,CAAC;QACH,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;CAAA;AAxCD,kCAwCC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tremho/mist-lift",
3
- "version": "2.2.2",
3
+ "version": "2.2.3",
4
4
  "description": "lift command line utility for MistLift development",
5
5
  "main": "build/lift.js",
6
6
  "bin": {
@@ -85,53 +85,60 @@ async function buildFunctionModules (
85
85
  ): Promise<number> {
86
86
  const announce = ac.blue.dim(`building ${funcName}...`)
87
87
  let announced = false
88
- let fails = 0
89
- // let builds = 0
88
+ // let fails = 0
89
+ const statObj = {
90
+ fails: 0
91
+ }
92
+
90
93
  let failFast = options.includes('--failfast')
91
94
  if (options.includes('--deferfail')) failFast = false
92
95
  const all: Array<Promise<void>> = []
93
- recurseDirectory(funcDir, (filepath, stats) => {
96
+ await recurseDirectory(funcDir, (filepath, stats) => {
94
97
  if (path.extname(filepath) === '.ts') {
95
98
  let relPath = filepath.substring(funcDir.length)
96
99
  relPath = relPath.substring(0, relPath.lastIndexOf(path.sep))
97
100
  const outDir = path.join(buildPath, relPath)
98
101
 
99
- if (!(fails > 0 && failFast)) {
102
+ if (!(statObj.fails > 0 && failFast)) {
100
103
  if (isNewer(filepath, outDir)) {
101
104
  if (!announced) {
102
105
  announced = true
103
106
  console.log(announce)
104
107
  }
105
- // builds++
106
- all.push(executeCommand('tsc', [
107
- '--esModuleInterop', 'true',
108
- '--target', 'ES2015',
109
- '--module', 'commonjs',
110
- '--lib', 'dom,es2015,scripthost,es2015.proxy',
111
- '--strict', 'true',
112
- '--noImplicitAny', 'false',
113
- '--skipLibCheck', 'true',
114
- '--forceConsistentCasingInFileNames', 'true',
115
- '--sourceMap', 'true',
116
- '--outdir', outDir,
117
- filepath
118
- ], '', true).then((result: { retcode: number | undefined, stdOut: string, stdErr: string }) => {
119
- if (result.retcode !== 0) {
120
- fails++
121
- // console.log("error detected", fails)
122
- const now = new Date()
123
- fs.utimesSync(filepath, now, now) // touch file so it is not skipped next build
124
- }
125
- }))
108
+ if (!filepath.endsWith('test.ts')) {
109
+ all.push(buildFile(filepath, outDir, statObj))
110
+ }
126
111
  }
127
112
  }
128
113
  }
129
- fails += doPostBuildSteps(funcDir, buildPath)
130
114
  return false
131
115
  })
132
- return await Promise.all(all).then(async () => {
133
- return fails
134
- })
116
+ statObj.fails += doPostBuildSteps(funcDir, buildPath)
117
+ await Promise.all(all)
118
+ return statObj.fails
119
+ }
120
+
121
+ async function buildFile (filepath: string, outDir: string, statObj: any): Promise<void> {
122
+ const result: any = await executeCommand('tsc', [
123
+ '--esModuleInterop', 'true',
124
+ '--target', 'ES2015',
125
+ '--module', 'commonjs',
126
+ '--lib', 'dom,es2015,scripthost,es2015.proxy',
127
+ '--strict', 'true',
128
+ '--noImplicitAny', 'false',
129
+ '--skipLibCheck', 'true',
130
+ '--forceConsistentCasingInFileNames', 'true',
131
+ '--sourceMap', 'true',
132
+ '--outdir', outDir,
133
+ filepath
134
+ ], '', true)
135
+
136
+ if (result.retcode !== 0) {
137
+ if (statObj !== null && statObj !== undefined) statObj.fails++
138
+ // console.log("error detected", fails)
139
+ const now = new Date()
140
+ fs.utimesSync(filepath, now, now) // touch file so it is not skipped next build
141
+ }
135
142
  }
136
143
 
137
144
  // do the steps after the build (file copies, etc)
@@ -16,8 +16,8 @@ export async function doTestAsync (args: string[]): Promise<number> {
16
16
  let ret = 0
17
17
  for (const funcName of args) {
18
18
  const result = await executeCommand('tap', [
19
- `build/functions/${funcName}/*.test.js`,
20
- /*
19
+ `functions/${funcName}/*.test.ts`,
20
+ /*
21
21
  - base -- looks a lot like terse
22
22
  - terse -- pass/fail counts
23
23
  - min -- errors only
@@ -29,11 +29,11 @@ export async function doTestAsync (args: string[]): Promise<number> {
29
29
  - junit
30
30
  - tap
31
31
  */
32
- '--reporter=base',
33
- '--color',
34
- '--passes',
35
- '--allow-empty-coverage',
36
- '--allow-incomplete-coverage'
32
+ '--reporter=base',
33
+ '--color',
34
+ '--passes',
35
+ '--allow-empty-coverage',
36
+ '--allow-incomplete-coverage'
37
37
 
38
38
  ], '', true)
39
39