ssube
/
js-yaml-schema
1
0
Fork 0
Code

fix: use module imports, upgrade js-utils to module

This commit is contained in:
Sean Sube 2022-10-08 15:56:30 -05:00
parent f6ef1f4b35
commit ceda879c1d
11 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -15,7 +15,7 @@
"author": "ssube", "author": "ssube",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"@apextoaster/js-utils": "0.5.0-0", "@apextoaster/js-utils": "0.5.0-1",
"@istanbuljs/nyc-config-typescript": "1.0.2", "@istanbuljs/nyc-config-typescript": "1.0.2",
"@istanbuljs/schema": "0.1.3", "@istanbuljs/schema": "0.1.3",
"@microsoft/api-documenter": "7.19.16", "@microsoft/api-documenter": "7.19.16",

2
src/app.ts
View File

@ -1,4 +1,4 @@
import { VERSION_INFO } from './version'; import { VERSION_INFO } from './version.js';
export async function main(argv: Array<string>): Promise<number> { export async function main(argv: Array<string>): Promise<number> {
/* eslint-disable-next-line no-console */ /* eslint-disable-next-line no-console */

10
src/index.ts
View File

@ -3,8 +3,8 @@ export {
createSchema, createSchema,
IncludeSchemaOptions, IncludeSchemaOptions,
SchemaOptions, SchemaOptions,
} from './schema'; } from './schema.js';
export { envType } from './type/Env'; export { envType } from './type/Env.js';
export { createInclude, IncludeOptions } from './type/Include'; export { createInclude, IncludeOptions } from './type/Include.js';
export { regexpType } from './type/Regexp'; export { regexpType } from './type/Regexp.js';
export { streamType } from './type/Stream'; export { streamType } from './type/Stream.js';

2
src/lib.ts
View File

@ -1,4 +1,4 @@
import { VERSION_INFO } from './version'; import { VERSION_INFO } from './version.js';
export { export {
VERSION_INFO, VERSION_INFO,

8
src/schema.ts
View File

@ -1,10 +1,10 @@
import { mustDefault } from '@apextoaster/js-utils'; import { mustDefault } from '@apextoaster/js-utils';
import { DEFAULT_SCHEMA, Schema } from 'js-yaml'; import { DEFAULT_SCHEMA, Schema } from 'js-yaml';
import { envType } from './type/Env'; import { envType } from './type/Env.js';
import { createInclude, IncludeOptions } from './type/Include'; import { createInclude, IncludeOptions } from './type/Include.js';
import { regexpType } from './type/Regexp'; import { regexpType } from './type/Regexp.js';
import { streamType } from './type/Stream'; import { streamType } from './type/Stream.js';
/** /**
* @public * @public

2
test/TestApp.ts
View File

@ -1,6 +1,6 @@
import { expect } from 'chai'; import { expect } from 'chai';
import { main } from '../src/app'; import { main } from '../src/app.js';
describe('main function', async () => { describe('main function', async () => {
it('should exit 1', async () => expect(main([])).to.eventually.equal(1)); it('should exit 1', async () => expect(main([])).to.eventually.equal(1));

7
test/type/TestEnv.ts
View File

@ -1,8 +1,7 @@
import { NotFoundError } from '@apextoaster/js-utils';
import { expect } from 'chai'; import { expect } from 'chai';
import { NotFoundError } from '@apextoaster/js-utils'; import { envType } from '../../src/type/Env.js';
import { envType } from '../../src/type/Env';
import { VERSION_INFO } from '../../src/version';
describe('env config type', async () => { describe('env config type', async () => {
it('should throw on missing variables', async () => { it('should throw on missing variables', async () => {
@ -16,6 +15,6 @@ describe('env config type', async () => {
}); });
it('should construct a value from variables', async () => { it('should construct a value from variables', async () => {
expect(envType.construct('CI_COMMIT_SHA')).to.equal(VERSION_INFO.git.commit); expect(envType.construct('CI_COMMIT_SHA')).to.match(/[a-f0-9]+/);
}); });
}); });

2
test/type/TestInclude.ts
View File

@ -3,7 +3,7 @@ import { expect } from 'chai';
import { DEFAULT_SCHEMA } from 'js-yaml'; import { DEFAULT_SCHEMA } from 'js-yaml';
import { join } from 'path'; import { join } from 'path';
import { createInclude, IncludeOptions } from '../../src/type/Include'; import { createInclude, IncludeOptions } from '../../src/type/Include.js';
const TEST_ROOT = '../test/type'; const TEST_ROOT = '../test/type';

2
test/type/TestRegexp.ts
View File

@ -1,6 +1,6 @@
import { expect } from 'chai'; import { expect } from 'chai';
import { regexpType } from '../../src/type/Regexp'; import { regexpType } from '../../src/type/Regexp.js';
describe('regexp config type', async () => { describe('regexp config type', async () => {
it('match slashed strings', async () => { it('match slashed strings', async () => {

2
test/type/TestStream.ts
View File

@ -1,7 +1,7 @@
import { NotFoundError } from '@apextoaster/js-utils'; import { NotFoundError } from '@apextoaster/js-utils';
import { expect } from 'chai'; import { expect } from 'chai';
import { streamType } from '../../src/type/Stream'; import { streamType } from '../../src/type/Stream.js';
describe('stream config type', async () => { describe('stream config type', async () => {
it('should resolve existing streams', async () => { it('should resolve existing streams', async () => {

8
yarn.lock
View File

@ -2,10 +2,10 @@
# yarn lockfile v1 # yarn lockfile v1
"@apextoaster/js-utils@0.5.0-0": "@apextoaster/js-utils@0.5.0-1":
version "0.5.0-0" version "0.5.0-1"
resolved "https://artifacts.apextoaster.com/repository/group-npm/@apextoaster/js-utils/-/js-utils-0.5.0-0.tgz#6c94a3a8a2530b8b4b97aee21984e6ae15488daf" resolved "https://artifacts.apextoaster.com/repository/group-npm/@apextoaster/js-utils/-/js-utils-0.5.0-1.tgz#c0060735df1b846e3f0f0c15b8181491cfb8ec5b"
integrity sha512-4uMjuogP86Z3OZVEu05PZTXBJi6YriNItfpZuQAgq4nqK8Vz3AIdHJoKGqycKmr22h3+/ASQzuWm+zcEJxrjUQ== integrity sha512-i1g8x2G2O/gHzmbuuSmqHJNbfGY4px4S3N6F/Cbb7u3opj5d3tvewlkubkl+CELrLllCxrhKxHZ8ZM8ajSwQdg==
"@babel/code-frame@^7.0.0": "@babel/code-frame@^7.0.0":
version "7.5.5" version "7.5.5"