fix(tests): fiddle with rollup chunks until tests work

.gitlab-ci.yml

@@ -1,4 +1,5 @@
 stages:
+  # @retain
   - status-pre
   - build
   - image
@@ -177,8 +178,10 @@ sonar-success:
   stage: status-post
   when: on_success
   dependencies:
+    # @retain
     - build-node
   script:
+    # @retain
     - make node_modules
     - sonar-scanner
         -Dsonar.projectKey=ssube_isolex

Makefile

@@ -102,7 +102,7 @@ test: test-cover
 
 test-check: ## run mocha unit tests with coverage reports
 	#$(NODE_BIN)/nyc $(COVER_OPTS) 
-	$(NODE_BIN)/mocha $(MOCHA_OPTS) $(TARGET_PATH)/test.js
+	ISOLEX_HOME=$(ROOT_PATH)/docs $(NODE_BIN)/mocha $(MOCHA_OPTS) $(TARGET_PATH)/test.js
 
 test-cover: ## run mocha unit tests with coverage reports
 test-cover: test-check

config/rollup.js

@@ -5,6 +5,7 @@ import multiEntry from 'rollup-plugin-multi-entry';
 import replace from 'rollup-plugin-replace';
 import resolve from 'rollup-plugin-node-resolve';
 import typescript from 'rollup-plugin-typescript2';
+import yaml from 'rollup-plugin-yaml';
 
 const debug = process.env['DEBUG'] === 'TRUE';
 const passStub = 'require("pass-stub")'
@@ -13,6 +14,14 @@ const metadata = require('../package.json');
 const bundle = {
 	external: [
 		'async_hooks',
+		'aws-sdk',
+		'chai',
+		'discord.js',
+		'ecc-jsbn',
+		'shelljs',
+		'snekfetch',
+		'sshpk',
+		'xmlbuilder',
 	],
 	input: {
 		include: [
@@ -30,15 +39,15 @@ const bundle = {
 			return 'vendor';
 		}
 
-		if (id.match(/commonjs/i) || id.match(/rollup/i) || id.includes('noicejs') || id.includes('pass-stub')) {
+		if (id.match(/commonjs-external/i) || id.match(/commonjsHelpers/) || id.includes('noicejs') || id.includes('pass-stub')) {
 			if (debug) {
 				console.log('==vendor', id);
 			}
 
 			return 'vendor';
 		}
 
-		if (id.includes('/src/')) {
+		if (id.includes('/isolex/src/') && !id.match(/src\/index.ts$/)) {
 			if (debug) {
 				console.log('==main', id);
 			}
@@ -68,6 +77,7 @@ const bundle = {
 	plugins: [
 		multiEntry(),
 		json(),
+		yaml(),
 		externals({
 			builtins: true,
 			deps: true,
@@ -120,7 +130,7 @@ const bundle = {
 			namedExports: {
 				'node_modules/chai/index.js': [
 					'expect',
-					'use',
+					//'use',
 				],
 				'node_modules/cron/lib/cron.js': [
 					'CronJob',

docs/.isolex.yml

@@ -0,0 +1 @@
+isolex.yml

package.json

@@ -9,7 +9,8 @@
   "private": false,
   "dependencies": {
     "jsonpath": "1.0.2",
-    "sqlite3": "4.0.9"
+    "sqlite3": "4.0.9",
+    "typeorm": "0.2.18"
   },
   "devDependencies": {
     "@kubernetes/client-node": "0.10.2",
@@ -85,6 +86,7 @@
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-replace": "^2.2.0",
     "rollup-plugin-typescript2": "^0.24.0",
+    "rollup-plugin-yaml": "^1.1.0",
     "rxjs": "6.5.2",
     "rxjs-tslint-rules": "4.24.3",
     "shiro-trie": "0.4.8",
@@ -100,7 +102,6 @@
     "tslint-microsoft-contrib": "6.2.0",
     "tslint-sonarts": "1.9.0",
     "typedoc": "0.14.2",
-    "typeorm": "0.2.18",
     "typescript": "3.5.3",
     "utf-8-validate": "5.0.2",
     "uuid": "3.3.2",

src/BaseService.ts

@@ -1,6 +1,6 @@
 import { BaseOptions, Inject, Logger, MissingValueError } from 'noicejs';
 import { Registry } from 'prom-client';
-import * as uuid from 'uuid';
+import uuid from 'uuid';
 
 import { SchemaError } from './error/SchemaError';
 import { ServiceModule } from './module/ServiceModule';

src/config/index.ts

@@ -56,6 +56,7 @@ export async function loadConfig(name: string, ...extras: Array<string>): Promis
   const paths = completePaths(name, extras);
 
   for (const p of paths) {
+    console.log('reading config from', p);
     const data = await readConfig(p);
     if (doesExist(data)) {
       return safeLoad(data, {

src/controller/github/PRController.ts

@@ -1,4 +1,4 @@
-import * as Octokit from '@octokit/rest';
+import Octokit from '@octokit/rest';
 import { Inject } from 'noicejs';
 
 import { CheckRBAC, Controller, ControllerData, Handler } from '..';

src/controller/kubernetes/AppsController.ts

@@ -1,4 +1,4 @@
-import * as k8s from '@kubernetes/client-node';
+import k8s from '@kubernetes/client-node';
 import { Inject } from 'noicejs';
 
 import { CheckRBAC, Controller, Handler } from '..';

src/controller/kubernetes/BaseController.ts

@@ -1,4 +1,4 @@
-import * as k8s from '@kubernetes/client-node';
+import k8s from '@kubernetes/client-node';
 import { Inject } from 'noicejs';
 
 import { Controller, ControllerData } from '..';

src/controller/kubernetes/CoreController.ts

@@ -1,4 +1,4 @@
-import * as k8s from '@kubernetes/client-node';
+import k8s from '@kubernetes/client-node';
 import { Inject } from 'noicejs';
 
 import { CheckRBAC, Controller, Handler } from '..';

src/listener/GithubListener.ts

@@ -1,4 +1,4 @@
-import * as Octokit from '@octokit/rest';
+import Octokit from '@octokit/rest';
 import { Inject } from 'noicejs';
 import { Repository } from 'typeorm';
 

src/locale/index.ts

@@ -1,4 +1,7 @@
 import i18next from 'i18next';
+import { readFileSync } from 'fs';
+import { safeLoad } from 'js-yaml';
+import { isNil } from 'lodash';
 import { Container, Inject, Logger } from 'noicejs';
 
 import { BaseService, BaseServiceOptions, INJECT_LOGGER } from '../BaseService';
@@ -7,6 +10,12 @@ import { mustExist } from '../utils';
 import { classLogger } from '../utils/logger';
 import { LocaleLogger } from '../utils/logger/LocaleLogger';
 
+const LOCALE_STRING = readFileSync('./src/locale/en.yml', 'utf-8');
+if (isNil(LOCALE_STRING)) {
+  throw new Error('unable to load schema from file');
+}
+const LOCALE_GLOBAL = safeLoad(LOCALE_STRING);
+
 export interface LocaleData {
   lang: string;
 }
@@ -42,9 +51,7 @@ export class Locale extends BaseService<LocaleData> implements ServiceLifecycle
       debug: true,
       lng: this.data.lang,
       resources: {
-        /* tslint:disable:no-var-requires */
-        en: require('src/locale/en.yml'),
-        /* tslint:enable:no-var-requires */
+        en: LOCALE_GLOBAL,
       },
     });
   }

src/parser/LexParser.ts

@@ -1,4 +1,4 @@
-import * as AWS from 'aws-sdk';
+import AWS from 'aws-sdk';
 import { isNil, isString, kebabCase } from 'lodash';
 import { MissingValueError } from 'noicejs';
 

src/schema/graph/index.ts

@@ -1,4 +1,4 @@
-import * as express from 'express';
+import express from 'express';
 import { GraphQLList, GraphQLObjectType, GraphQLSchema, GraphQLString } from 'graphql';
 import { isNil } from 'lodash';
 import { Inject } from 'noicejs';

src/schema/index.ts

@@ -1,10 +1,16 @@
-import * as Ajv from 'ajv';
+import Ajv from 'ajv';
+import { readFileSync } from 'fs';
+import { safeLoad } from 'js-yaml';
+import { isNil } from 'lodash';
 
 import { InvalidArgumentError } from '../error/InvalidArgumentError';
 import { SCHEMA_KEYWORD_REGEXP } from './keyword/Regexp';
 
-/* tslint:disable-next-line:no-var-requires */
-export const SCHEMA_GLOBAL = require('src/schema/schema.yml');
+const SCHEMA_STRING = readFileSync('./src/schema/schema.yml', 'utf-8');
+if (isNil(SCHEMA_STRING)) {
+  throw new Error('unable to load schema from file');
+}
+const SCHEMA_GLOBAL = safeLoad(SCHEMA_STRING);
 
 export interface SchemaResult {
   errors: Array<string>;

src/schema/keyword/Regexp.ts

@@ -1,4 +1,4 @@
-import * as Ajv from 'ajv';
+import Ajv from 'ajv';
 import { isBoolean } from 'lodash';
 
 export const SCHEMA_KEYWORD_REGEXP: Ajv.KeywordDefinition = {

src/utils/BunyanLogger.ts

@@ -1,4 +1,4 @@
-import * as bunyan from 'bunyan';
+import bunyan from 'bunyan';
 import { Logger } from 'noicejs';
 
 import { prototypeName } from '.';
@@ -12,6 +12,7 @@ export class BunyanLogger {
       ...options,
       serializers: {
         ...bunyan.stdSerializers,
+        container: prototypeName,
         logger: prototypeName,
         module: prototypeName,
       },

src/utils/JsonPath.ts

@@ -1,4 +1,4 @@
-import * as jp from 'jsonpath';
+import jp from 'jsonpath';
 
 import { TemplateScope } from './Template';
 

src/utils/Math.ts

@@ -1,5 +1,5 @@
 import { isNil } from 'lodash';
-import * as mathjs from 'mathjs';
+import mathjs from 'mathjs';
 
 import { TemplateScope } from './Template';
 

src/utils/TemplateCompiler.ts

@@ -1,4 +1,4 @@
-import * as Handlebars from 'handlebars';
+import Handlebars from 'handlebars';
 import { BaseOptions, Inject, Logger } from 'noicejs';
 
 import { mustExist } from '.';

src/version.ts

@@ -1,20 +1,15 @@
-// webpack environment defines
-declare const BUILD_JOB: string;
-declare const BUILD_RUNNER: string;
-declare const GIT_BRANCH: string;
-declare const GIT_COMMIT: string;
-declare const NODE_VERSION: string;
-declare const WEBPACK_VERSION: string;
-
 export const VERSION_INFO = {
+  app: {
+    name: '{{ APP_NAME }}',
+    version: '{{ APP_VERSION }}',
+  },
   build: {
-    job: BUILD_JOB,
-    node: NODE_VERSION,
-    runner: BUILD_RUNNER,
-    webpack: WEBPACK_VERSION,
+    job: '{{ BUILD_JOB }}',
+    node: '{{ NODE_VERSION }}',
+    runner: '{{ BUILD_RUNNER }}',
   },
   git: {
-    branch: GIT_BRANCH,
-    commit: GIT_COMMIT,
+    branch: '{{ GIT_BRANCH }}',
+    commit: '{{ GIT_COMMIT }}',
   },
 };

test/harness.ts

@@ -1,8 +1,8 @@
-import * as chai from 'chai';
-import * as chaiAsPromised from 'chai-as-promised';
+import chai from 'chai';
+import chaiAsPromised from 'chai-as-promised';
 import { ineeda } from 'ineeda';
-import * as sinonChai from 'sinon-chai';
-import * as sourceMapSupport from 'source-map-support';
+import sinonChai from 'sinon-chai';
+import sourceMapSupport from 'source-map-support';
 
 import { BotModule } from '../src/module/BotModule';
 import { EntityModule } from '../src/module/EntityModule';
@@ -54,9 +54,3 @@ const modules = [
   ServiceModule,
   TransformModule,
 ];
-
-// tslint:disable-next-line:no-any
-const testContext = (require as any).context('../test', true, /Test.*$/);
-testContext.keys().forEach(testContext);
-// tslint:disable-next-line:no-default-export
-export default testContext;

test/module/TestServiceModule.ts

@@ -4,6 +4,7 @@ import { spy } from 'sinon';
 
 import { ServiceModule } from '../../src/module/ServiceModule';
 import { Service, ServiceEvent } from '../../src/Service';
+import { defer } from '../../src/utils/Async';
 import { describeAsync, itAsync } from '../helpers/async';
 import { createContainer } from '../helpers/container';
 
@@ -17,7 +18,7 @@ async function createModule() {
   const testSvc = ineeda<Service>(metadata);
 
   const module = new ServiceModule({
-    timeout: 100,
+    timeout: 10,
   });
   module.bind(TEST_SERVICE_NAME).toInstance(testSvc);
 
@@ -55,6 +56,8 @@ describeAsync('DI modules', async () => {
       await module.stop();
       expect(start).to.have.callCount(1);
       expect(stop).to.have.callCount(1);
+
+      await defer(50);
     });
 
     itAsync('should create and save child services', async () => {

test/utils/TestBunyanLogger.ts

@@ -1,4 +1,4 @@
-import * as bunyan from 'bunyan';
+import bunyan from 'bunyan';
 import { expect } from 'chai';
 
 import { BunyanLogger } from '../../src/utils/BunyanLogger';

vendor/schema/index.d.ts

@@ -0,0 +1,3 @@
+declare module "./schema.yml" {
+  export = {};
+}