From 3493a291224248ebb18a3337a22803ba8fd1058a Mon Sep 17 00:00:00 2001 From: Roger Date: Fri, 18 Nov 2022 17:57:42 -0500 Subject: [PATCH 01/15] abuild: migrate packaging from commonjs to esm --- README.md | 2 +- jest.config.ts | 15 +++++++---- package.json | 2 +- packages/nukak-browser/package.json | 2 ++ packages/nukak-browser/src/http/bus.spec.ts | 2 +- packages/nukak-browser/src/http/http.ts | 2 +- packages/nukak-browser/src/http/index.ts | 4 +-- packages/nukak-browser/src/index.ts | 2 +- packages/nukak-browser/src/options.spec.ts | 4 +-- packages/nukak-browser/src/options.ts | 4 +-- .../nukak-browser/src/querier/httpQuerier.ts | 4 +-- packages/nukak-browser/src/querier/index.ts | 6 ++--- .../src/querier/querier.util.spec.ts | 2 +- .../nukak-browser/src/type/clientQuerier.ts | 4 +-- .../src/type/clientQuerierPool.ts | 2 +- .../src/type/clientRepository.ts | 2 +- packages/nukak-browser/src/type/index.ts | 6 ++--- packages/nukak-browser/tsconfig.json | 2 +- packages/nukak-browser/webpack.config.ts | 4 ++- packages/nukak-express/package.json | 2 ++ packages/nukak-express/src/index.ts | 4 +-- .../nukak-express/src/querierMiddleware.ts | 2 +- packages/nukak-express/src/query.util.spec.ts | 2 +- packages/nukak/package.json | 3 ++- .../src/dialect/abstractSqlDialect-spec.ts | 2 +- packages/nukak/src/dialect/index.ts | 8 +++--- .../nukak/src/dialect/mysqlDialect.spec.ts | 4 +-- packages/nukak/src/dialect/mysqlDialect.ts | 4 +-- .../nukak/src/dialect/postgresDialect.spec.ts | 2 +- packages/nukak/src/dialect/postgresDialect.ts | 4 +-- .../nukak/src/dialect/sqliteDialect.spec.ts | 4 +-- packages/nukak/src/dialect/sqliteDialect.ts | 2 +- .../src/entity/decorator/definition.spec.ts | 8 +++--- packages/nukak/src/entity/decorator/entity.ts | 2 +- packages/nukak/src/entity/decorator/field.ts | 2 +- packages/nukak/src/entity/decorator/id.ts | 2 +- packages/nukak/src/entity/decorator/index.ts | 8 +++--- .../src/entity/decorator/relation.spec.ts | 2 +- .../nukak/src/entity/decorator/relation.ts | 2 +- packages/nukak/src/index.ts | 2 +- packages/nukak/src/maria/index.ts | 4 +-- packages/nukak/src/maria/mariadbQuerier.it.ts | 2 +- .../nukak/src/maria/mariadbQuerierPool.ts | 2 +- packages/nukak/src/mongo/index.ts | 6 ++--- packages/nukak/src/mongo/mongoDialect.spec.ts | 2 +- packages/nukak/src/mongo/mongodbQuerier.it.ts | 4 +-- packages/nukak/src/mongo/mongodbQuerier.ts | 2 +- .../nukak/src/mongo/mongodbQuerierPool.ts | 4 +-- packages/nukak/src/mysql/index.ts | 4 +-- packages/nukak/src/mysql/mysql2Querier.it.ts | 2 +- packages/nukak/src/mysql/mysql2QuerierPool.ts | 2 +- packages/nukak/src/options.spec.ts | 2 +- packages/nukak/src/postgres/index.ts | 4 +-- packages/nukak/src/postgres/pgQuerier.it.ts | 2 +- packages/nukak/src/postgres/pgQuerierPool.ts | 2 +- .../src/querier/abstractSqlQuerier-it.ts | 4 +-- .../src/querier/abstractSqlQuerier-spec.ts | 2 +- .../nukak/src/querier/abstractSqlQuerier.ts | 2 +- packages/nukak/src/querier/decorator/index.ts | 4 +-- .../querier/decorator/injectQuerier.spec.ts | 2 +- .../querier/decorator/transactional.spec.ts | 4 +-- .../src/querier/decorator/transactional.ts | 2 +- packages/nukak/src/querier/index.ts | 4 +-- .../src/repository/genericRepository.spec.ts | 2 +- packages/nukak/src/repository/index.ts | 2 +- packages/nukak/src/test/index.ts | 6 ++--- packages/nukak/src/test/it.util.ts | 2 +- packages/nukak/src/type/entity.ts | 4 +-- packages/nukak/src/type/index.ts | 14 +++++------ packages/nukak/src/type/querier.ts | 10 ++++---- packages/nukak/src/type/querierPool.ts | 2 +- packages/nukak/src/type/query.ts | 4 +-- packages/nukak/src/type/repository.ts | 8 +++--- packages/nukak/src/type/universalQuerier.ts | 8 +++--- packages/nukak/src/util/dialect.util.spec.ts | 4 +-- packages/nukak/src/util/index.ts | 10 ++++---- packages/nukak/src/util/object.util.spec.ts | 2 +- packages/nukak/src/util/sql.util.spec.ts | 2 +- packages/nukak/src/util/sql.util.ts | 2 +- packages/nukak/src/util/string.util.spec.ts | 2 +- tsconfig.json | 7 +++--- yarn.lock | 25 ++++++++++++------- 82 files changed, 173 insertions(+), 153 deletions(-) diff --git a/README.md b/README.md index 9e7e98a0..c370cd93 100644 --- a/README.md +++ b/README.md @@ -156,7 +156,7 @@ export class MeasureUnit { ```ts import { getQuerier } from 'nukak'; import { Transactional, InjectQuerier } from 'nukak/querier'; -import { User } from './shared/models'; +import { User } from './shared/models.js'; export class UserService { @Transactional() diff --git a/jest.config.ts b/jest.config.ts index 9820142c..e99edc5a 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -2,11 +2,15 @@ import tsconfig from './tsconfig.json'; const tsConfigPaths = tsconfig.compilerOptions.paths; -const moduleNameMapper = Object.keys(tsConfigPaths).reduce((acc, key) => { - const prop = '^' + key.replace('/*', '/(.*)') + '$'; - acc[prop] = '/' + tsConfigPaths[key][0].replace('/*', '/$1'); - return acc; -}, {}); +const moduleNameMapper = Object.keys(tsConfigPaths).reduce( + (acc, key) => { + const prop = '^' + key.replace('/*', '/(.*)') + '$'; + acc[prop] = '/' + tsConfigPaths[key][0].replace('/*', '/$1'); + return acc; + }, + // sourced from https://kulshekhar.github.io/ts-jest/docs/guides/esm-support/#esm-presets + { '^(\\.{1,2}/.*)\\.js$': '$1' } +); module.exports = { verbose: true, @@ -17,6 +21,7 @@ module.exports = { 'ts-jest', { tsconfig: 'tsconfig.test.json', + useESM: true, }, ], }, diff --git a/package.json b/package.json index 6845ac70..80604fbd 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@typescript-eslint/parser": "^5.43.0", "concurrently": "^7.5.0", "coveralls": "^3.1.1", - "eslint": "^8.27.0", + "eslint": "^8.28.0", "eslint-config-prettier": "^8.5.0", "eslint-import-resolver-typescript": "3.5.2", "eslint-plugin-import": "^2.26.0", diff --git a/packages/nukak-browser/package.json b/packages/nukak-browser/package.json index ff29a62f..b1d532e8 100644 --- a/packages/nukak-browser/package.json +++ b/packages/nukak-browser/package.json @@ -3,7 +3,9 @@ "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", "version": "0.0.4", + "type": "module", "main": "./nukak-browser.min.js", + "exports": "./nukak-browser.min.js", "types": "./nukak-browser.min.d.ts", "scripts": { "copyfiles": "copyfiles -f package.json ../../README.md ../../CHANGELOG.md dist", diff --git a/packages/nukak-browser/src/http/bus.spec.ts b/packages/nukak-browser/src/http/bus.spec.ts index dfb4ef92..785c351a 100644 --- a/packages/nukak-browser/src/http/bus.spec.ts +++ b/packages/nukak-browser/src/http/bus.spec.ts @@ -1,5 +1,5 @@ import { RequestNotification } from '../type'; -import { on, notify } from './bus'; +import { on, notify } from './bus.js'; it('bus', () => { const off = on((msg) => { diff --git a/packages/nukak-browser/src/http/http.ts b/packages/nukak-browser/src/http/http.ts index 8d455a9b..d2266b8f 100644 --- a/packages/nukak-browser/src/http/http.ts +++ b/packages/nukak-browser/src/http/http.ts @@ -1,5 +1,5 @@ import { RequestOptions, RequestSuccessResponse, RequestErrorResponse } from '../type'; -import { notify } from './bus'; +import { notify } from './bus.js'; export function get(url: string, opts?: RequestOptions) { return request(url, { method: 'get' }, opts); diff --git a/packages/nukak-browser/src/http/index.ts b/packages/nukak-browser/src/http/index.ts index 4c86c0e9..97ea430a 100644 --- a/packages/nukak-browser/src/http/index.ts +++ b/packages/nukak-browser/src/http/index.ts @@ -1,2 +1,2 @@ -export * from './bus'; -export * from './http'; +export * from './bus.js'; +export * from './http.js'; diff --git a/packages/nukak-browser/src/index.ts b/packages/nukak-browser/src/index.ts index 5db81b11..87a4ccce 100644 --- a/packages/nukak-browser/src/index.ts +++ b/packages/nukak-browser/src/index.ts @@ -1,4 +1,4 @@ +export * from './options.js'; export * from './type'; -export * from './options'; export * from './http'; export * from './querier'; diff --git a/packages/nukak-browser/src/options.spec.ts b/packages/nukak-browser/src/options.spec.ts index d3ec898d..3c9435cc 100644 --- a/packages/nukak-browser/src/options.spec.ts +++ b/packages/nukak-browser/src/options.spec.ts @@ -1,7 +1,7 @@ import { User } from 'nukak/test'; -import { getQuerier, getQuerierPool, setQuerierPool } from './options'; +import { getQuerier, getQuerierPool, setQuerierPool } from './options.js'; import { GenericClientRepository, HttpQuerier } from './querier'; -import { ClientQuerierPool } from './type/clientQuerierPool'; +import { ClientQuerierPool } from './type/clientQuerierPool.js'; describe('options', () => { it('default getQuerier', () => { diff --git a/packages/nukak-browser/src/options.ts b/packages/nukak-browser/src/options.ts index c1d97c17..fd0798d7 100644 --- a/packages/nukak-browser/src/options.ts +++ b/packages/nukak-browser/src/options.ts @@ -1,6 +1,6 @@ -import { HttpQuerier } from './querier/httpQuerier'; +import { HttpQuerier } from './querier/httpQuerier.js'; import { ClientQuerier } from './type'; -import { ClientQuerierPool } from './type/clientQuerierPool'; +import { ClientQuerierPool } from './type/clientQuerierPool.js'; let defaultPool: ClientQuerierPool = { getQuerier: () => new HttpQuerier('/api'), diff --git a/packages/nukak-browser/src/querier/httpQuerier.ts b/packages/nukak-browser/src/querier/httpQuerier.ts index 25788372..035300fa 100644 --- a/packages/nukak-browser/src/querier/httpQuerier.ts +++ b/packages/nukak-browser/src/querier/httpQuerier.ts @@ -3,8 +3,8 @@ import { IdValue, Query, QueryCriteria, QueryOne, QueryOptions, QuerySearch, Que import { kebabCase } from 'nukak/util'; import { RequestOptions, RequestFindOptions, ClientQuerier, ClientRepository } from '../type'; import { get, post, patch, remove } from '../http'; -import { stringifyQuery } from './querier.util'; -import { GenericClientRepository } from './genericClientRepository'; +import { stringifyQuery } from './querier.util.js'; +import { GenericClientRepository } from './genericClientRepository.js'; export class HttpQuerier implements ClientQuerier { constructor(readonly basePath: string) {} diff --git a/packages/nukak-browser/src/querier/index.ts b/packages/nukak-browser/src/querier/index.ts index d8b49e59..5180f850 100644 --- a/packages/nukak-browser/src/querier/index.ts +++ b/packages/nukak-browser/src/querier/index.ts @@ -1,3 +1,3 @@ -export * from './httpQuerier'; -export * from './genericClientRepository'; -export * from './querier.util'; +export * from './httpQuerier.js'; +export * from './genericClientRepository.js'; +export * from './querier.util.js'; diff --git a/packages/nukak-browser/src/querier/querier.util.spec.ts b/packages/nukak-browser/src/querier/querier.util.spec.ts index 851432ca..7dc890f9 100644 --- a/packages/nukak-browser/src/querier/querier.util.spec.ts +++ b/packages/nukak-browser/src/querier/querier.util.spec.ts @@ -1,6 +1,6 @@ import { Query } from 'nukak/type'; import { Item, User } from 'nukak/test'; -import { stringifyQuery, stringifyQueryParameter } from './querier.util'; +import { stringifyQuery, stringifyQueryParameter } from './querier.util.js'; it('stringifyQuery -- empty', () => { const source: Query = {}; diff --git a/packages/nukak-browser/src/type/clientQuerier.ts b/packages/nukak-browser/src/type/clientQuerier.ts index e048e818..dfcc042e 100644 --- a/packages/nukak-browser/src/type/clientQuerier.ts +++ b/packages/nukak-browser/src/type/clientQuerier.ts @@ -1,6 +1,6 @@ import { Query, Type, UniversalQuerier, QueryCriteria, QueryOptions, QuerySearch, IdValue, QueryUnique } from 'nukak/type'; -import { ClientRepository } from './clientRepository'; -import { RequestOptions, RequestSuccessResponse } from './request'; +import { ClientRepository } from './clientRepository.js'; +import { RequestOptions, RequestSuccessResponse } from './request.js'; export interface ClientQuerier extends UniversalQuerier { count(entity: Type, qm?: QuerySearch, opts?: RequestOptions): Promise>; diff --git a/packages/nukak-browser/src/type/clientQuerierPool.ts b/packages/nukak-browser/src/type/clientQuerierPool.ts index 4533bdd4..c329de84 100644 --- a/packages/nukak-browser/src/type/clientQuerierPool.ts +++ b/packages/nukak-browser/src/type/clientQuerierPool.ts @@ -1,4 +1,4 @@ -import { ClientQuerier } from './clientQuerier'; +import { ClientQuerier } from './clientQuerier.js'; export type ClientQuerierPool = { getQuerier(): ClientQuerier; diff --git a/packages/nukak-browser/src/type/clientRepository.ts b/packages/nukak-browser/src/type/clientRepository.ts index 4b55bc88..e1a9862d 100644 --- a/packages/nukak-browser/src/type/clientRepository.ts +++ b/packages/nukak-browser/src/type/clientRepository.ts @@ -1,5 +1,5 @@ import { Query, UniversalRepository, QueryCriteria, QueryOptions, QuerySearch, IdValue, QueryUnique } from 'nukak/type'; -import { RequestOptions, RequestSuccessResponse } from './request'; +import { RequestOptions, RequestSuccessResponse } from './request.js'; export interface ClientRepository extends UniversalRepository { count(qm: QuerySearch, opts?: RequestOptions): Promise>; diff --git a/packages/nukak-browser/src/type/index.ts b/packages/nukak-browser/src/type/index.ts index bfa4a645..18818c2a 100644 --- a/packages/nukak-browser/src/type/index.ts +++ b/packages/nukak-browser/src/type/index.ts @@ -1,3 +1,3 @@ -export * from './request'; -export * from './clientQuerier'; -export * from './clientRepository'; +export * from './request.js'; +export * from './clientQuerier.js'; +export * from './clientRepository.js'; diff --git a/packages/nukak-browser/tsconfig.json b/packages/nukak-browser/tsconfig.json index e70066c0..f3e48180 100644 --- a/packages/nukak-browser/tsconfig.json +++ b/packages/nukak-browser/tsconfig.json @@ -2,7 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "target": "ES2020", - "lib": ["ES2022", "DOM"], + "lib": ["ESNext", "DOM"], "importHelpers": false, "outDir": "dist" }, diff --git a/packages/nukak-browser/webpack.config.ts b/packages/nukak-browser/webpack.config.ts index 07a3727b..d0f994bf 100644 --- a/packages/nukak-browser/webpack.config.ts +++ b/packages/nukak-browser/webpack.config.ts @@ -1,6 +1,7 @@ /* eslint-disable @typescript-eslint/no-var-requires */ -import { resolve } from 'path'; +import { resolve } from 'node:path'; import { Compiler, Configuration } from 'webpack'; +import ResolveTypeScriptPlugin from 'resolve-typescript-plugin'; const parentDir = '../../'; const tsPathAliases = require(`${parentDir}tsconfig.json`).compilerOptions.paths; @@ -39,6 +40,7 @@ const config: Configuration = { resolve: { extensions: ['.ts', '.js'], alias: buildAlias(), + plugins: [new ResolveTypeScriptPlugin()], }, entry: { diff --git a/packages/nukak-express/package.json b/packages/nukak-express/package.json index 50d3736e..a7ffba59 100644 --- a/packages/nukak-express/package.json +++ b/packages/nukak-express/package.json @@ -5,6 +5,7 @@ "license": "MIT", "version": "0.0.4", "main": "./index.js", + "exports": "./index.js", "types": "./index.d.ts", "scripts": { "copyfiles": "copyfiles -f package.json ../../README.md ../../CHANGELOG.md dist", @@ -21,6 +22,7 @@ "copyfiles": "^2.4.1", "express": "^4.18.2", "nukak": "^0.0.4", + "resolve-typescript-plugin": "^2.0.0", "rimraf": "^3.0.2", "typescript": "^4.9.3" }, diff --git a/packages/nukak-express/src/index.ts b/packages/nukak-express/src/index.ts index 2a43d8f2..1a34e18b 100644 --- a/packages/nukak-express/src/index.ts +++ b/packages/nukak-express/src/index.ts @@ -1,2 +1,2 @@ -export * from './querierMiddleware'; -export * from './query.util'; +export * from './querierMiddleware.js'; +export * from './query.util.js'; diff --git a/packages/nukak-express/src/querierMiddleware.ts b/packages/nukak-express/src/querierMiddleware.ts index fb94b858..2a3f5c5d 100644 --- a/packages/nukak-express/src/querierMiddleware.ts +++ b/packages/nukak-express/src/querierMiddleware.ts @@ -5,7 +5,7 @@ import { getQuerier } from 'nukak/options'; import { EntityMeta, IdValue, Query, QueryOne, QueryUnique, Type } from 'nukak/type'; import { kebabCase } from 'nukak/util'; import { getEntities, getMeta } from 'nukak/entity/decorator'; -import { parseQuery } from './query.util'; +import { parseQuery } from './query.util.js'; export function querierMiddleware(opts: MiddlewareOptions = {}) { const router = expressRouter(); diff --git a/packages/nukak-express/src/query.util.spec.ts b/packages/nukak-express/src/query.util.spec.ts index 43157fc4..6bb16346 100644 --- a/packages/nukak-express/src/query.util.spec.ts +++ b/packages/nukak-express/src/query.util.spec.ts @@ -1,6 +1,6 @@ import { Query, QueryFilter, QueryStringified } from 'nukak/type'; import { Item } from 'nukak/test'; -import { parseQuery } from './query.util'; +import { parseQuery } from './query.util.js'; it('parseQuery -- empty', () => { const res1 = parseQuery(undefined); diff --git a/packages/nukak/package.json b/packages/nukak/package.json index dd687dc3..d097d854 100644 --- a/packages/nukak/package.json +++ b/packages/nukak/package.json @@ -4,7 +4,8 @@ "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", "version": "0.0.4", - "main": "index.js", + "main": "./index.js", + "exports": "./index.js", "types": "./index.d.ts", "scripts": { "copyfiles": "copyfiles -f package.json ../../README.md ../../CHANGELOG.md dist", diff --git a/packages/nukak/src/dialect/abstractSqlDialect-spec.ts b/packages/nukak/src/dialect/abstractSqlDialect-spec.ts index f984bf0c..f97874c9 100644 --- a/packages/nukak/src/dialect/abstractSqlDialect-spec.ts +++ b/packages/nukak/src/dialect/abstractSqlDialect-spec.ts @@ -1,7 +1,7 @@ import { Company, InventoryAdjustment, Item, ItemAdjustment, MeasureUnit, Profile, Spec, Tax, TaxCategory, User } from '../test'; import { FieldKey, QueryFilter } from '../type'; import { raw } from '../util'; -import { AbstractSqlDialect } from './abstractSqlDialect'; +import { AbstractSqlDialect } from './abstractSqlDialect.js'; export abstract class AbstractSqlDialectSpec implements Spec { constructor(readonly dialect: AbstractSqlDialect) {} diff --git a/packages/nukak/src/dialect/index.ts b/packages/nukak/src/dialect/index.ts index 8048de46..e4b72d69 100644 --- a/packages/nukak/src/dialect/index.ts +++ b/packages/nukak/src/dialect/index.ts @@ -1,4 +1,4 @@ -export * from './abstractSqlDialect'; -export * from './mysqlDialect'; -export * from './postgresDialect'; -export * from './sqliteDialect'; +export * from './abstractSqlDialect.js'; +export * from './mysqlDialect.js'; +export * from './postgresDialect.js'; +export * from './sqliteDialect.js'; diff --git a/packages/nukak/src/dialect/mysqlDialect.spec.ts b/packages/nukak/src/dialect/mysqlDialect.spec.ts index af8178e1..22df9400 100644 --- a/packages/nukak/src/dialect/mysqlDialect.spec.ts +++ b/packages/nukak/src/dialect/mysqlDialect.spec.ts @@ -1,6 +1,6 @@ import { createSpec, Item, User } from '../test'; -import { AbstractSqlDialectSpec } from './abstractSqlDialect-spec'; -import { MySqlDialect } from './mysqlDialect'; +import { AbstractSqlDialectSpec } from './abstractSqlDialect-spec.js'; +import { MySqlDialect } from './mysqlDialect.js'; export class MySqlDialectSpec extends AbstractSqlDialectSpec { constructor() { diff --git a/packages/nukak/src/dialect/mysqlDialect.ts b/packages/nukak/src/dialect/mysqlDialect.ts index ed029616..028af606 100644 --- a/packages/nukak/src/dialect/mysqlDialect.ts +++ b/packages/nukak/src/dialect/mysqlDialect.ts @@ -1,6 +1,6 @@ -import { getMeta } from '../entity'; +import { getMeta } from '../entity/decorator'; import { QueryComparisonOptions, QueryFilterMap, QueryTextSearchOptions, Type } from '../type'; -import { AbstractSqlDialect } from './abstractSqlDialect'; +import { AbstractSqlDialect } from './abstractSqlDialect.js'; export class MySqlDialect extends AbstractSqlDialect { constructor() { diff --git a/packages/nukak/src/dialect/postgresDialect.spec.ts b/packages/nukak/src/dialect/postgresDialect.spec.ts index 1d4123f4..d42bb699 100644 --- a/packages/nukak/src/dialect/postgresDialect.spec.ts +++ b/packages/nukak/src/dialect/postgresDialect.spec.ts @@ -1,5 +1,5 @@ import { User, Item, createSpec, TaxCategory } from '../test'; -import { PostgresDialect } from './postgresDialect'; +import { PostgresDialect } from './postgresDialect.js'; class PostgresDialectSpec { readonly dialect = new PostgresDialect(); diff --git a/packages/nukak/src/dialect/postgresDialect.ts b/packages/nukak/src/dialect/postgresDialect.ts index 2ddf8457..3e89f465 100644 --- a/packages/nukak/src/dialect/postgresDialect.ts +++ b/packages/nukak/src/dialect/postgresDialect.ts @@ -1,6 +1,6 @@ import { QueryComparisonOptions, QueryFilterMap, QueryOptions, QueryFilterFieldOperatorMap, QueryTextSearchOptions, Type, FieldKey } from '../type'; -import { getMeta } from '../entity'; -import { AbstractSqlDialect } from './abstractSqlDialect'; +import { getMeta } from '../entity/decorator'; +import { AbstractSqlDialect } from './abstractSqlDialect.js'; export class PostgresDialect extends AbstractSqlDialect { constructor() { diff --git a/packages/nukak/src/dialect/sqliteDialect.spec.ts b/packages/nukak/src/dialect/sqliteDialect.spec.ts index fc81b57c..3ae31394 100644 --- a/packages/nukak/src/dialect/sqliteDialect.spec.ts +++ b/packages/nukak/src/dialect/sqliteDialect.spec.ts @@ -1,6 +1,6 @@ import { createSpec } from '../test'; -import { AbstractSqlDialectSpec } from './abstractSqlDialect-spec'; -import { SqliteDialect } from './sqliteDialect'; +import { AbstractSqlDialectSpec } from './abstractSqlDialect-spec.js'; +import { SqliteDialect } from './sqliteDialect.js'; class SqliteDialectSpec extends AbstractSqlDialectSpec { constructor() { diff --git a/packages/nukak/src/dialect/sqliteDialect.ts b/packages/nukak/src/dialect/sqliteDialect.ts index 42a8a27f..82d7c538 100644 --- a/packages/nukak/src/dialect/sqliteDialect.ts +++ b/packages/nukak/src/dialect/sqliteDialect.ts @@ -1,4 +1,4 @@ -import { AbstractSqlDialect } from './abstractSqlDialect'; +import { AbstractSqlDialect } from './abstractSqlDialect.js'; export class SqliteDialect extends AbstractSqlDialect { constructor() { diff --git a/packages/nukak/src/entity/decorator/definition.spec.ts b/packages/nukak/src/entity/decorator/definition.spec.ts index 71abed35..cfa29ba2 100644 --- a/packages/nukak/src/entity/decorator/definition.spec.ts +++ b/packages/nukak/src/entity/decorator/definition.spec.ts @@ -15,10 +15,10 @@ import { ItemTag, } from '../../test'; import { EntityGetter, EntityMeta, OnFieldCallback, QueryRaw, QueryRawFn } from '../../type'; -import { getEntities, getMeta } from './definition'; -import { Entity } from './entity'; -import { Id } from './id'; -import { Field } from './field'; +import { getEntities, getMeta } from './definition.js'; +import { Entity } from './entity.js'; +import { Id } from './id.js'; +import { Field } from './field.js'; it('User', () => { const meta = getMeta(User); diff --git a/packages/nukak/src/entity/decorator/entity.ts b/packages/nukak/src/entity/decorator/entity.ts index 231485f3..54fdad04 100644 --- a/packages/nukak/src/entity/decorator/entity.ts +++ b/packages/nukak/src/entity/decorator/entity.ts @@ -1,5 +1,5 @@ import { EntityOptions, Type } from '../../type'; -import { defineEntity } from './definition'; +import { defineEntity } from './definition.js'; export function Entity(opts?: EntityOptions) { return (entity: Type): void => { diff --git a/packages/nukak/src/entity/decorator/field.ts b/packages/nukak/src/entity/decorator/field.ts index 064ef3fa..d0d8b92d 100644 --- a/packages/nukak/src/entity/decorator/field.ts +++ b/packages/nukak/src/entity/decorator/field.ts @@ -1,5 +1,5 @@ import { FieldOptions, Type } from '../../type'; -import { defineField } from './definition'; +import { defineField } from './definition.js'; export function Field(opts?: FieldOptions) { return (target: object, key: string): void => { diff --git a/packages/nukak/src/entity/decorator/id.ts b/packages/nukak/src/entity/decorator/id.ts index 29072119..22c13dca 100644 --- a/packages/nukak/src/entity/decorator/id.ts +++ b/packages/nukak/src/entity/decorator/id.ts @@ -1,5 +1,5 @@ import { FieldOptions, Type } from '../../type'; -import { defineId } from './definition'; +import { defineId } from './definition.js'; export function Id(opts?: Omit) { return (target: object, key: string): void => { diff --git a/packages/nukak/src/entity/decorator/index.ts b/packages/nukak/src/entity/decorator/index.ts index a34372b6..d4708f24 100644 --- a/packages/nukak/src/entity/decorator/index.ts +++ b/packages/nukak/src/entity/decorator/index.ts @@ -1,5 +1,5 @@ -export * from './entity'; -export * from './id'; -export * from './field'; -export * from './relation'; +export * from './entity.js'; +export * from './id.js'; +export * from './field.js'; +export * from './relation.js'; export { getMeta, getEntities } from './definition'; diff --git a/packages/nukak/src/entity/decorator/relation.spec.ts b/packages/nukak/src/entity/decorator/relation.spec.ts index db9c8778..bbd179e3 100644 --- a/packages/nukak/src/entity/decorator/relation.spec.ts +++ b/packages/nukak/src/entity/decorator/relation.spec.ts @@ -1,4 +1,4 @@ -import { ManyToOne } from './relation'; +import { ManyToOne } from './relation.js'; it('invalid auto-inferred type', () => { expect(() => { diff --git a/packages/nukak/src/entity/decorator/relation.ts b/packages/nukak/src/entity/decorator/relation.ts index 4cdf2538..fac0935a 100644 --- a/packages/nukak/src/entity/decorator/relation.ts +++ b/packages/nukak/src/entity/decorator/relation.ts @@ -6,7 +6,7 @@ import { RelationManyToManyOptions, Type, } from '../../type'; -import { defineRelation } from './definition'; +import { defineRelation } from './definition.js'; function Relation(opts: RelationOptions) { return (target: object, key: string) => { diff --git a/packages/nukak/src/index.ts b/packages/nukak/src/index.ts index a33a6128..ef647d09 100644 --- a/packages/nukak/src/index.ts +++ b/packages/nukak/src/index.ts @@ -1,2 +1,2 @@ -export * from './options'; +export * from './options.js'; export * from './type'; diff --git a/packages/nukak/src/maria/index.ts b/packages/nukak/src/maria/index.ts index da778aee..397b9e8b 100644 --- a/packages/nukak/src/maria/index.ts +++ b/packages/nukak/src/maria/index.ts @@ -1,2 +1,2 @@ -export * from './mariadbQuerier'; -export * from './mariadbQuerierPool'; +export * from './mariadbQuerier.js'; +export * from './mariadbQuerierPool.js'; diff --git a/packages/nukak/src/maria/mariadbQuerier.it.ts b/packages/nukak/src/maria/mariadbQuerier.it.ts index 4170d75f..c99e0365 100644 --- a/packages/nukak/src/maria/mariadbQuerier.it.ts +++ b/packages/nukak/src/maria/mariadbQuerier.it.ts @@ -1,6 +1,6 @@ import { AbstractSqlQuerierIt } from 'nukak/querier/abstractSqlQuerier-it'; import { createSpec } from 'nukak/test'; -import { MariadbQuerierPool } from './mariadbQuerierPool'; +import { MariadbQuerierPool } from './mariadbQuerierPool.js'; export class MariadbQuerierIt extends AbstractSqlQuerierIt { constructor() { diff --git a/packages/nukak/src/maria/mariadbQuerierPool.ts b/packages/nukak/src/maria/mariadbQuerierPool.ts index c93cea68..8e4222ab 100644 --- a/packages/nukak/src/maria/mariadbQuerierPool.ts +++ b/packages/nukak/src/maria/mariadbQuerierPool.ts @@ -1,6 +1,6 @@ import { createPool, Pool, PoolConfig } from 'mariadb'; import { QuerierLogger, QuerierPool } from 'nukak/type'; -import { MariadbQuerier } from './mariadbQuerier'; +import { MariadbQuerier } from './mariadbQuerier.js'; export class MariadbQuerierPool implements QuerierPool { readonly pool: Pool; diff --git a/packages/nukak/src/mongo/index.ts b/packages/nukak/src/mongo/index.ts index bf0d4d36..40794b7f 100644 --- a/packages/nukak/src/mongo/index.ts +++ b/packages/nukak/src/mongo/index.ts @@ -1,3 +1,3 @@ -export * from './mongoDialect'; -export * from './mongodbQuerier'; -export * from './mongodbQuerierPool'; +export * from './mongoDialect.js'; +export * from './mongodbQuerier.js'; +export * from './mongodbQuerierPool.js'; diff --git a/packages/nukak/src/mongo/mongoDialect.spec.ts b/packages/nukak/src/mongo/mongoDialect.spec.ts index 2bdf0137..2cfe89b3 100644 --- a/packages/nukak/src/mongo/mongoDialect.spec.ts +++ b/packages/nukak/src/mongo/mongoDialect.spec.ts @@ -1,7 +1,7 @@ import { ObjectId } from 'mongodb'; import { Item, Spec, TaxCategory, User, createSpec, Tax } from 'nukak/test'; import { getMeta } from 'nukak/entity'; -import { MongoDialect } from './mongoDialect'; +import { MongoDialect } from './mongoDialect.js'; class MongoDialectSpec implements Spec { dialect: MongoDialect; diff --git a/packages/nukak/src/mongo/mongodbQuerier.it.ts b/packages/nukak/src/mongo/mongodbQuerier.it.ts index 6d8f7802..f7066f97 100644 --- a/packages/nukak/src/mongo/mongodbQuerier.it.ts +++ b/packages/nukak/src/mongo/mongodbQuerier.it.ts @@ -1,8 +1,8 @@ import { getEntities, getMeta } from 'nukak/entity/decorator'; import { AbstractQuerierIt } from 'nukak/querier/abstractQuerier-it'; import { createSpec } from 'nukak/test'; -import { MongodbQuerierPool } from './mongodbQuerierPool'; -import { MongodbQuerier } from './mongodbQuerier'; +import { MongodbQuerierPool } from './mongodbQuerierPool.js'; +import { MongodbQuerier } from './mongodbQuerier.js'; class MongodbQuerierIt extends AbstractQuerierIt { constructor() { diff --git a/packages/nukak/src/mongo/mongodbQuerier.ts b/packages/nukak/src/mongo/mongodbQuerier.ts index 2a070399..55b6424c 100644 --- a/packages/nukak/src/mongo/mongodbQuerier.ts +++ b/packages/nukak/src/mongo/mongodbQuerier.ts @@ -4,7 +4,7 @@ import { AbstractQuerier } from 'nukak/querier'; import { getMeta } from 'nukak/entity/decorator'; import { clone, getPersistable, getPersistables, getFieldCallbackValue, hasKeys, isProjectingRelations } from 'nukak/util'; -import { MongoDialect } from './mongoDialect'; +import { MongoDialect } from './mongoDialect.js'; export class MongodbQuerier extends AbstractQuerier { private session: ClientSession; diff --git a/packages/nukak/src/mongo/mongodbQuerierPool.ts b/packages/nukak/src/mongo/mongodbQuerierPool.ts index 41994421..e592b4f2 100644 --- a/packages/nukak/src/mongo/mongodbQuerierPool.ts +++ b/packages/nukak/src/mongo/mongodbQuerierPool.ts @@ -1,7 +1,7 @@ import { MongoClient, MongoClientOptions } from 'mongodb'; import { QuerierLogger, QuerierPool } from 'nukak/type'; -import { MongodbQuerier } from './mongodbQuerier'; -import { MongoDialect } from './mongoDialect'; +import { MongodbQuerier } from './mongodbQuerier.js'; +import { MongoDialect } from './mongoDialect.js'; export class MongodbQuerierPool implements QuerierPool { private readonly client: MongoClient; diff --git a/packages/nukak/src/mysql/index.ts b/packages/nukak/src/mysql/index.ts index 42f58037..92ba5a10 100644 --- a/packages/nukak/src/mysql/index.ts +++ b/packages/nukak/src/mysql/index.ts @@ -1,2 +1,2 @@ -export * from './mysql2Querier'; -export * from './mysql2QuerierPool'; +export * from './mysql2Querier.js'; +export * from './mysql2QuerierPool.js'; diff --git a/packages/nukak/src/mysql/mysql2Querier.it.ts b/packages/nukak/src/mysql/mysql2Querier.it.ts index abbd6f1f..55eb909f 100644 --- a/packages/nukak/src/mysql/mysql2Querier.it.ts +++ b/packages/nukak/src/mysql/mysql2Querier.it.ts @@ -1,6 +1,6 @@ import { createSpec } from 'nukak/test'; import { AbstractSqlQuerierIt } from 'nukak/querier/abstractSqlQuerier-it'; -import { MySql2QuerierPool } from './mysql2QuerierPool'; +import { MySql2QuerierPool } from './mysql2QuerierPool.js'; export class MySql2QuerierIt extends AbstractSqlQuerierIt { constructor() { diff --git a/packages/nukak/src/mysql/mysql2QuerierPool.ts b/packages/nukak/src/mysql/mysql2QuerierPool.ts index 6998cb3c..300dd444 100644 --- a/packages/nukak/src/mysql/mysql2QuerierPool.ts +++ b/packages/nukak/src/mysql/mysql2QuerierPool.ts @@ -1,6 +1,6 @@ import { createPool, Pool, PoolOptions } from 'mysql2/promise'; import { QuerierLogger, QuerierPool } from 'nukak/type'; -import { MySql2Querier } from './mysql2Querier'; +import { MySql2Querier } from './mysql2Querier.js'; export class MySql2QuerierPool implements QuerierPool { readonly pool: Pool; diff --git a/packages/nukak/src/options.spec.ts b/packages/nukak/src/options.spec.ts index b5c0386d..e6124ea4 100644 --- a/packages/nukak/src/options.spec.ts +++ b/packages/nukak/src/options.spec.ts @@ -1,4 +1,4 @@ -import { getQuerier, getQuerierPool, setQuerierPool } from './options'; +import { getQuerier, getQuerierPool, setQuerierPool } from './options.js'; import { User } from './test'; import { Querier, Repository } from './type'; diff --git a/packages/nukak/src/postgres/index.ts b/packages/nukak/src/postgres/index.ts index 28199fb6..979f2aec 100644 --- a/packages/nukak/src/postgres/index.ts +++ b/packages/nukak/src/postgres/index.ts @@ -1,2 +1,2 @@ -export * from './pgQuerier'; -export * from './pgQuerierPool'; +export * from './pgQuerier.js'; +export * from './pgQuerierPool.js'; diff --git a/packages/nukak/src/postgres/pgQuerier.it.ts b/packages/nukak/src/postgres/pgQuerier.it.ts index 0d67995f..c80b28e1 100644 --- a/packages/nukak/src/postgres/pgQuerier.it.ts +++ b/packages/nukak/src/postgres/pgQuerier.it.ts @@ -1,7 +1,7 @@ import { types } from 'pg'; import { createSpec } from 'nukak/test'; import { AbstractSqlQuerierIt } from 'nukak/querier/abstractSqlQuerier-it'; -import { PgQuerierPool } from './pgQuerierPool'; +import { PgQuerierPool } from './pgQuerierPool.js'; types.setTypeParser(types.builtins.INT8, (value: string) => parseInt(value)); types.setTypeParser(types.builtins.FLOAT8, (value: string) => parseFloat(value)); diff --git a/packages/nukak/src/postgres/pgQuerierPool.ts b/packages/nukak/src/postgres/pgQuerierPool.ts index 0176d297..ab81aade 100644 --- a/packages/nukak/src/postgres/pgQuerierPool.ts +++ b/packages/nukak/src/postgres/pgQuerierPool.ts @@ -1,6 +1,6 @@ import { Pool, PoolConfig } from 'pg'; import { QuerierLogger, QuerierPool } from 'nukak/type'; -import { PgQuerier } from './pgQuerier'; +import { PgQuerier } from './pgQuerier.js'; export class PgQuerierPool implements QuerierPool { readonly pool: Pool; diff --git a/packages/nukak/src/querier/abstractSqlQuerier-it.ts b/packages/nukak/src/querier/abstractSqlQuerier-it.ts index e9ad689b..4fdc5173 100644 --- a/packages/nukak/src/querier/abstractSqlQuerier-it.ts +++ b/packages/nukak/src/querier/abstractSqlQuerier-it.ts @@ -1,7 +1,7 @@ import { createTables, dropTables } from '../test'; import { QuerierPool } from '../type'; -import { AbstractQuerierIt } from './abstractQuerier-it'; -import { AbstractSqlQuerier } from './abstractSqlQuerier'; +import { AbstractQuerierIt } from './abstractQuerier-it.js'; +import { AbstractSqlQuerier } from './abstractSqlQuerier.js'; export abstract class AbstractSqlQuerierIt extends AbstractQuerierIt { constructor(pool: QuerierPool, readonly idType: string) { diff --git a/packages/nukak/src/querier/abstractSqlQuerier-spec.ts b/packages/nukak/src/querier/abstractSqlQuerier-spec.ts index 2d556cca..128dcca7 100644 --- a/packages/nukak/src/querier/abstractSqlQuerier-spec.ts +++ b/packages/nukak/src/querier/abstractSqlQuerier-spec.ts @@ -1,7 +1,7 @@ import { raw } from '../util'; import { User, InventoryAdjustment, Spec, Item, Tag, MeasureUnit, dropTables, createTables, clearTables } from '../test'; import { QuerierPool } from '../type'; -import { AbstractSqlQuerier } from './abstractSqlQuerier'; +import { AbstractSqlQuerier } from './abstractSqlQuerier.js'; export abstract class AbstractSqlQuerierSpec implements Spec { querier: AbstractSqlQuerier; diff --git a/packages/nukak/src/querier/abstractSqlQuerier.ts b/packages/nukak/src/querier/abstractSqlQuerier.ts index faeffd04..ea9c4fa4 100644 --- a/packages/nukak/src/querier/abstractSqlQuerier.ts +++ b/packages/nukak/src/querier/abstractSqlQuerier.ts @@ -3,7 +3,7 @@ import { unflatObjects, clone } from '../util'; import { AbstractSqlDialect } from '../dialect'; import { getMeta } from '../entity'; -import { AbstractQuerier } from './abstractQuerier'; +import { AbstractQuerier } from './abstractQuerier.js'; export abstract class AbstractSqlQuerier extends AbstractQuerier { private hasPendingTransaction?: boolean; diff --git a/packages/nukak/src/querier/decorator/index.ts b/packages/nukak/src/querier/decorator/index.ts index 6ea9d153..cc387f71 100644 --- a/packages/nukak/src/querier/decorator/index.ts +++ b/packages/nukak/src/querier/decorator/index.ts @@ -1,2 +1,2 @@ -export * from './injectQuerier'; -export * from './transactional'; +export * from './injectQuerier.js'; +export * from './transactional.js'; diff --git a/packages/nukak/src/querier/decorator/injectQuerier.spec.ts b/packages/nukak/src/querier/decorator/injectQuerier.spec.ts index 36b39b3d..b95d9a9e 100644 --- a/packages/nukak/src/querier/decorator/injectQuerier.spec.ts +++ b/packages/nukak/src/querier/decorator/injectQuerier.spec.ts @@ -1,5 +1,5 @@ import { Querier } from '../../type'; -import { getInjectedQuerierIndex, InjectQuerier } from './injectQuerier'; +import { getInjectedQuerierIndex, InjectQuerier } from './injectQuerier.js'; describe('injectQuerier', () => { it('no inject', () => { diff --git a/packages/nukak/src/querier/decorator/transactional.spec.ts b/packages/nukak/src/querier/decorator/transactional.spec.ts index 59431a34..f87e5406 100644 --- a/packages/nukak/src/querier/decorator/transactional.spec.ts +++ b/packages/nukak/src/querier/decorator/transactional.spec.ts @@ -1,7 +1,7 @@ import { getQuerier, setQuerierPool } from '../../options'; import { Querier, QuerierPool, Writable } from '../../type'; -import { InjectQuerier } from './injectQuerier'; -import { Transactional } from './transactional'; +import { InjectQuerier } from './injectQuerier.js'; +import { Transactional } from './transactional.js'; describe('transactional', () => { let anotherQuerierPool: QuerierPool; diff --git a/packages/nukak/src/querier/decorator/transactional.ts b/packages/nukak/src/querier/decorator/transactional.ts index 26a60dd3..65b2a396 100644 --- a/packages/nukak/src/querier/decorator/transactional.ts +++ b/packages/nukak/src/querier/decorator/transactional.ts @@ -1,6 +1,6 @@ import { Querier, QuerierPool, Type } from '../../type'; import { getQuerierPool } from '../../options'; -import { getInjectedQuerierIndex } from './injectQuerier'; +import { getInjectedQuerierIndex } from './injectQuerier.js'; export function Transactional({ propagation = 'required', diff --git a/packages/nukak/src/querier/index.ts b/packages/nukak/src/querier/index.ts index 56ec3a72..7f58e800 100644 --- a/packages/nukak/src/querier/index.ts +++ b/packages/nukak/src/querier/index.ts @@ -1,3 +1,3 @@ -export * from './abstractQuerier'; -export * from './abstractSqlQuerier'; +export * from './abstractQuerier.js'; +export * from './abstractSqlQuerier.js'; export * from './decorator'; diff --git a/packages/nukak/src/repository/genericRepository.spec.ts b/packages/nukak/src/repository/genericRepository.spec.ts index 201f368d..a6747997 100644 --- a/packages/nukak/src/repository/genericRepository.spec.ts +++ b/packages/nukak/src/repository/genericRepository.spec.ts @@ -1,6 +1,6 @@ import { Querier, Repository } from '../type'; import { User } from '../test'; -import { GenericRepository } from './genericRepository'; +import { GenericRepository } from './genericRepository.js'; describe('repository', () => { let repository: Repository; diff --git a/packages/nukak/src/repository/index.ts b/packages/nukak/src/repository/index.ts index a12e0dbb..edfa77c0 100644 --- a/packages/nukak/src/repository/index.ts +++ b/packages/nukak/src/repository/index.ts @@ -1 +1 @@ -export * from './genericRepository'; +export * from './genericRepository.js'; diff --git a/packages/nukak/src/test/index.ts b/packages/nukak/src/test/index.ts index c2d551d2..d16596f7 100644 --- a/packages/nukak/src/test/index.ts +++ b/packages/nukak/src/test/index.ts @@ -1,3 +1,3 @@ -export * from './entityMock'; -export * from './spec.util'; -export * from './it.util'; +export * from './entityMock.js'; +export * from './spec.util.js'; +export * from './it.util.js'; diff --git a/packages/nukak/src/test/it.util.ts b/packages/nukak/src/test/it.util.ts index 5d0c8c06..e6f3a45e 100644 --- a/packages/nukak/src/test/it.util.ts +++ b/packages/nukak/src/test/it.util.ts @@ -1,7 +1,7 @@ import { getKeys } from '../util'; import { AbstractSqlQuerier } from '../querier'; import { Type } from '../type'; -import { getEntities, getMeta } from '../entity'; +import { getEntities, getMeta } from '../entity/decorator'; export async function createTables(querier: AbstractSqlQuerier, primaryKeyType: string) { const entities = getEntities(); diff --git a/packages/nukak/src/type/entity.ts b/packages/nukak/src/type/entity.ts index d8edd8d4..51177cea 100644 --- a/packages/nukak/src/type/entity.ts +++ b/packages/nukak/src/type/entity.ts @@ -1,5 +1,5 @@ -import { QueryRaw } from './query'; -import { Scalar, Type } from './utility'; +import { QueryRaw } from './query.js'; +import { Scalar, Type } from './utility.js'; export const idKey = Symbol('idKey'); diff --git a/packages/nukak/src/type/index.ts b/packages/nukak/src/type/index.ts index 817b424c..a8fb188a 100644 --- a/packages/nukak/src/type/index.ts +++ b/packages/nukak/src/type/index.ts @@ -1,7 +1,7 @@ -export * from './utility'; -export * from './entity'; -export * from './query'; -export * from './universalQuerier'; -export * from './querier'; -export * from './querierPool'; -export * from './repository'; +export * from './utility.js'; +export * from './entity.js'; +export * from './query.js'; +export * from './universalQuerier.js'; +export * from './querier.js'; +export * from './querierPool.js'; +export * from './repository.js'; diff --git a/packages/nukak/src/type/querier.ts b/packages/nukak/src/type/querier.ts index 23f398d0..97227d4b 100644 --- a/packages/nukak/src/type/querier.ts +++ b/packages/nukak/src/type/querier.ts @@ -1,8 +1,8 @@ -import { Type } from './utility'; -import { Query, QueryCriteria, QueryOne, QueryOptions, QuerySearch, QueryUnique } from './query'; -import { Repository } from './repository'; -import { IdValue } from './entity'; -import { UniversalQuerier } from './universalQuerier'; +import { Type } from './utility.js'; +import { Query, QueryCriteria, QueryOne, QueryOptions, QuerySearch, QueryUnique } from './query.js'; +import { Repository } from './repository.js'; +import { IdValue } from './entity.js'; +import { UniversalQuerier } from './universalQuerier.js'; /** * logger function to debug queries. diff --git a/packages/nukak/src/type/querierPool.ts b/packages/nukak/src/type/querierPool.ts index 446054d9..c5a7af42 100644 --- a/packages/nukak/src/type/querierPool.ts +++ b/packages/nukak/src/type/querierPool.ts @@ -1,4 +1,4 @@ -import { Querier, QuerierLogger } from './querier'; +import { Querier, QuerierLogger } from './querier.js'; /** * querier pool. diff --git a/packages/nukak/src/type/query.ts b/packages/nukak/src/type/query.ts index 830ddbdb..889089ee 100644 --- a/packages/nukak/src/type/query.ts +++ b/packages/nukak/src/type/query.ts @@ -1,5 +1,5 @@ -import { FieldKey, IdValue, Key, RelationKey } from './entity'; -import { BooleanLike, ExpandScalar, Scalar, Type, Unpacked } from './utility'; +import { FieldKey, IdValue, Key, RelationKey } from './entity.js'; +import { BooleanLike, ExpandScalar, Scalar, Type, Unpacked } from './utility.js'; export type QueryOptions = { /** diff --git a/packages/nukak/src/type/repository.ts b/packages/nukak/src/type/repository.ts index db7f3482..bca03272 100644 --- a/packages/nukak/src/type/repository.ts +++ b/packages/nukak/src/type/repository.ts @@ -1,7 +1,7 @@ -import { IdValue } from './entity'; -import { Querier } from './querier'; -import { Query, QueryCriteria, QueryOne, QueryOptions, QuerySearch, QueryUnique } from './query'; -import { Type } from './utility'; +import { IdValue } from './entity.js'; +import { Querier } from './querier.js'; +import { Query, QueryCriteria, QueryOne, QueryOptions, QuerySearch, QueryUnique } from './query.js'; +import { Type } from './utility.js'; /** * A `repository` allows to interact with the datasource to perform persistence operations on a specific entity. diff --git a/packages/nukak/src/type/universalQuerier.ts b/packages/nukak/src/type/universalQuerier.ts index 5fda3105..1ada25db 100644 --- a/packages/nukak/src/type/universalQuerier.ts +++ b/packages/nukak/src/type/universalQuerier.ts @@ -1,7 +1,7 @@ -import { Type } from './utility'; -import { Query, QueryCriteria, QueryOne, QueryOptions, QuerySearch, QueryUnique } from './query'; -import { UniversalRepository } from './repository'; -import { IdValue } from './entity'; +import { Type } from './utility.js'; +import { Query, QueryCriteria, QueryOne, QueryOptions, QuerySearch, QueryUnique } from './query.js'; +import { UniversalRepository } from './repository.js'; +import { IdValue } from './entity.js'; /** * A `querier` allows to interact with the datasource to perform persistence operations on any entity. diff --git a/packages/nukak/src/util/dialect.util.spec.ts b/packages/nukak/src/util/dialect.util.spec.ts index 2b5bc50d..940c42d4 100644 --- a/packages/nukak/src/util/dialect.util.spec.ts +++ b/packages/nukak/src/util/dialect.util.spec.ts @@ -1,7 +1,7 @@ import { getMeta } from '../entity/decorator'; import { User } from '../test/entityMock'; -import { augmentFilter } from './dialect.util'; -import { raw } from './raw'; +import { augmentFilter } from './dialect.util.js'; +import { raw } from './raw.js'; it('augmentFilter empty', () => { const meta = getMeta(User); diff --git a/packages/nukak/src/util/index.ts b/packages/nukak/src/util/index.ts index d1366c7b..36e8a940 100644 --- a/packages/nukak/src/util/index.ts +++ b/packages/nukak/src/util/index.ts @@ -1,5 +1,5 @@ -export * from './string.util'; -export * from './object.util'; -export * from './dialect.util'; -export * from './sql.util'; -export * from './raw'; +export * from './string.util.js'; +export * from './object.util.js'; +export * from './dialect.util.js'; +export * from './sql.util.js'; +export * from './raw.js'; diff --git a/packages/nukak/src/util/object.util.spec.ts b/packages/nukak/src/util/object.util.spec.ts index 6afbf418..33e66c99 100644 --- a/packages/nukak/src/util/object.util.spec.ts +++ b/packages/nukak/src/util/object.util.spec.ts @@ -1,4 +1,4 @@ -import { clone, hasKeys, getKeys } from './object.util'; +import { clone, hasKeys, getKeys } from './object.util.js'; it('clone', () => { expect(clone({})).toEqual({}); diff --git a/packages/nukak/src/util/sql.util.spec.ts b/packages/nukak/src/util/sql.util.spec.ts index be3919e0..7e4e5904 100644 --- a/packages/nukak/src/util/sql.util.spec.ts +++ b/packages/nukak/src/util/sql.util.spec.ts @@ -1,6 +1,6 @@ import { Item, ItemAdjustment, Storehouse } from '../test'; import { QuerySortMap } from '../type'; -import { flatObject, unflatObjects } from './sql.util'; +import { flatObject, unflatObjects } from './sql.util.js'; it('flatObject', () => { expect(flatObject(undefined)).toEqual({}); diff --git a/packages/nukak/src/util/sql.util.ts b/packages/nukak/src/util/sql.util.ts index e0d3a28b..8c87824f 100644 --- a/packages/nukak/src/util/sql.util.ts +++ b/packages/nukak/src/util/sql.util.ts @@ -1,4 +1,4 @@ -import { hasKeys, getKeys } from './object.util'; +import { hasKeys, getKeys } from './object.util.js'; export function flatObject(obj: E, pre?: string): E { return getKeys(obj).reduce((acc, key) => flatObjectEntry(acc, key, obj[key], typeof obj[key] === 'object' ? '' : pre), {} as E); diff --git a/packages/nukak/src/util/string.util.spec.ts b/packages/nukak/src/util/string.util.spec.ts index b0643da3..6e5ed499 100644 --- a/packages/nukak/src/util/string.util.spec.ts +++ b/packages/nukak/src/util/string.util.spec.ts @@ -1,4 +1,4 @@ -import { kebabCase, lowerFirst, upperFirst } from './string.util'; +import { kebabCase, lowerFirst, upperFirst } from './string.util.js'; it('kebabCase', () => { const res1 = kebabCase('SomeWordsAndMore'); diff --git a/tsconfig.json b/tsconfig.json index 3c83ac96..923f9cb6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,10 +1,11 @@ { "ts-node": { - "files": true + "files": true, + "esm": true }, "compilerOptions": { - "module": "CommonJS", - "moduleResolution": "node", + "module": "NodeNext", + "moduleResolution": "NodeNext", "lib": ["ESNext"], "target": "ES2022", "strict": true, diff --git a/yarn.lock b/yarn.lock index 60d92921..72ab642a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3638,10 +3638,10 @@ eslint-visitor-keys@^3.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== -eslint@^8.27.0: - version "8.27.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.27.0.tgz#d547e2f7239994ad1faa4bb5d84e5d809db7cf64" - integrity sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ== +eslint@^8.28.0: + version "8.28.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.28.0.tgz#81a680732634677cc890134bcdd9fdfea8e63d6e" + integrity sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ== dependencies: "@eslint/eslintrc" "^1.3.3" "@humanwhocodes/config-array" "^0.11.6" @@ -6529,6 +6529,13 @@ resolve-global@1.0.0, resolve-global@^1.0.0: dependencies: global-dirs "^0.1.1" +resolve-typescript-plugin@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/resolve-typescript-plugin/-/resolve-typescript-plugin-2.0.0.tgz#1c4c91e6cc37ee82b1093586fe9ac531247456a7" + integrity sha512-bkQMP9BVupQfZM9N6SS/QOy6PZh4dL4/d9LBhC+fmb5CdE6geGcm2fZUfXii2xXqwmCOu4xp2QTAnZhIBwGadQ== + dependencies: + tslib "2.4.0" + resolve.exports@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" @@ -7313,16 +7320,16 @@ tsconfig-paths@^3.14.1: minimist "^1.2.6" strip-bom "^3.0.0" +tslib@2.4.0, tslib@^2.1.0, tslib@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" + integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== + tslib@^1.11.1, tslib@^1.8.1: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.1.0, tslib@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" - integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== - tslib@^2.3.1, tslib@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" From 50baf14a2a0fb6341191e7196dfb9f85d626a8e8 Mon Sep 17 00:00:00 2001 From: Roger Date: Fri, 18 Nov 2022 18:20:52 -0500 Subject: [PATCH 02/15] abuild: migrate packaging from commonjs to esm --- packages/nukak-browser/package.json | 6 ++- packages/nukak-browser/src/http/bus.spec.ts | 2 +- packages/nukak-browser/src/http/bus.ts | 2 +- packages/nukak-browser/src/http/http.ts | 2 +- packages/nukak-browser/src/index.ts | 6 +-- packages/nukak-browser/src/options.spec.ts | 4 +- packages/nukak-browser/src/options.ts | 2 +- .../src/querier/genericClientRepository.ts | 4 +- .../nukak-browser/src/querier/httpQuerier.ts | 10 ++--- .../src/querier/querier.util.spec.ts | 4 +- .../nukak-browser/src/querier/querier.util.ts | 2 +- .../nukak-browser/src/type/clientQuerier.ts | 2 +- .../src/type/clientRepository.ts | 2 +- packages/nukak-browser/tsconfig.json | 1 + packages/nukak-browser/webpack.config.ts | 39 ++++++++-------- .../nukak-express/src/querierMiddleware.ts | 2 +- packages/nukak-express/src/query.util.spec.ts | 2 +- packages/nukak-express/src/query.util.ts | 2 +- packages/nukak-express/tsconfig.json | 1 + .../src/dialect/abstractSqlDialect-spec.ts | 2 +- .../nukak/src/dialect/abstractSqlDialect.ts | 2 +- packages/nukak/src/dialect/mysqlDialect.ts | 2 +- packages/nukak/src/dialect/postgresDialect.ts | 10 ++++- .../src/entity/decorator/definition.spec.ts | 2 +- .../nukak/src/entity/decorator/definition.ts | 13 +++++- packages/nukak/src/entity/decorator/entity.ts | 2 +- packages/nukak/src/entity/decorator/field.ts | 2 +- packages/nukak/src/entity/decorator/id.ts | 2 +- .../nukak/src/entity/decorator/relation.ts | 2 +- packages/nukak/src/index.ts | 2 +- packages/nukak/src/maria/mariadbQuerier.ts | 2 +- .../nukak/src/maria/mariadbQuerierPool.ts | 2 +- packages/nukak/src/mongo/mongoDialect.ts | 13 +++++- packages/nukak/src/mongo/mongodbQuerier.ts | 2 +- .../nukak/src/mongo/mongodbQuerierPool.ts | 2 +- packages/nukak/src/mysql/mysql2Querier.ts | 2 +- packages/nukak/src/mysql/mysql2QuerierPool.ts | 2 +- packages/nukak/src/options.spec.ts | 2 +- packages/nukak/src/options.ts | 2 +- packages/nukak/src/postgres/pgQuerier.ts | 2 +- packages/nukak/src/postgres/pgQuerierPool.ts | 2 +- .../nukak/src/querier/abstractQuerier-it.ts | 2 +- packages/nukak/src/querier/abstractQuerier.ts | 2 +- .../src/querier/abstractSqlQuerier-it.ts | 2 +- .../src/querier/abstractSqlQuerier-spec.ts | 2 +- .../nukak/src/querier/abstractSqlQuerier.ts | 2 +- .../querier/decorator/injectQuerier.spec.ts | 2 +- .../src/querier/decorator/injectQuerier.ts | 2 +- .../querier/decorator/transactional.spec.ts | 2 +- .../src/querier/decorator/transactional.ts | 2 +- .../src/repository/genericRepository.spec.ts | 2 +- .../nukak/src/repository/genericRepository.ts | 2 +- packages/nukak/src/test/entityMock.ts | 2 +- packages/nukak/src/test/it.util.ts | 2 +- packages/nukak/src/util/dialect.util.ts | 2 +- packages/nukak/src/util/raw.ts | 2 +- packages/nukak/src/util/sql.util.spec.ts | 2 +- tsconfig.test.json | 1 + yarn.lock | 45 ++++++++++++++++--- 59 files changed, 159 insertions(+), 88 deletions(-) diff --git a/packages/nukak-browser/package.json b/packages/nukak-browser/package.json index b1d532e8..d39b8392 100644 --- a/packages/nukak-browser/package.json +++ b/packages/nukak-browser/package.json @@ -9,8 +9,9 @@ "types": "./nukak-browser.min.d.ts", "scripts": { "copyfiles": "copyfiles -f package.json ../../README.md ../../CHANGELOG.md dist", - "compile": "NODE_ENV=production webpack", - "build": "yarn clean && concurrently 'yarn:compile' && yarn copyfiles", + "compile": "NODE_ENV=production node --loader ts-node/esm node_modules/.bin/webpack", + "dts": "dts-bundle-generator --no-check -o './dist/nukak-browser.min.d.ts' './src/index.ts'", + "build": "yarn clean && concurrently 'yarn:compile' 'yarn:dts' && yarn copyfiles", "start": "yarn clean && webpack --profile --bail --watch --info-verbosity verbose", "clean": "rimraf dist *.tsbuildinfo" }, @@ -18,6 +19,7 @@ "@types/webpack": "^5.28.0", "copyfiles": "^2.4.1", "dts-bundle": "^0.7.3", + "dts-bundle-generator": "^7.0.0", "nukak": "^0.0.4", "rimraf": "^3.0.2", "source-map-loader": "^4.0.1", diff --git a/packages/nukak-browser/src/http/bus.spec.ts b/packages/nukak-browser/src/http/bus.spec.ts index 785c351a..6e9ec173 100644 --- a/packages/nukak-browser/src/http/bus.spec.ts +++ b/packages/nukak-browser/src/http/bus.spec.ts @@ -1,4 +1,4 @@ -import { RequestNotification } from '../type'; +import { RequestNotification } from '../type/index.js'; import { on, notify } from './bus.js'; it('bus', () => { diff --git a/packages/nukak-browser/src/http/bus.ts b/packages/nukak-browser/src/http/bus.ts index d9ab7b96..48ec96d2 100644 --- a/packages/nukak-browser/src/http/bus.ts +++ b/packages/nukak-browser/src/http/bus.ts @@ -1,4 +1,4 @@ -import { RequestCallback, RequestNotification } from '../type'; +import { RequestCallback, RequestNotification } from '../type/index.js'; const subscriptors: RequestCallback[] = []; diff --git a/packages/nukak-browser/src/http/http.ts b/packages/nukak-browser/src/http/http.ts index d2266b8f..43db0510 100644 --- a/packages/nukak-browser/src/http/http.ts +++ b/packages/nukak-browser/src/http/http.ts @@ -1,4 +1,4 @@ -import { RequestOptions, RequestSuccessResponse, RequestErrorResponse } from '../type'; +import { RequestOptions, RequestSuccessResponse, RequestErrorResponse } from '../type/index.js'; import { notify } from './bus.js'; export function get(url: string, opts?: RequestOptions) { diff --git a/packages/nukak-browser/src/index.ts b/packages/nukak-browser/src/index.ts index 87a4ccce..e289ceb7 100644 --- a/packages/nukak-browser/src/index.ts +++ b/packages/nukak-browser/src/index.ts @@ -1,4 +1,4 @@ export * from './options.js'; -export * from './type'; -export * from './http'; -export * from './querier'; +export * from './type/index.js'; +export * from './http/index.js'; +export * from './querier/index.js'; diff --git a/packages/nukak-browser/src/options.spec.ts b/packages/nukak-browser/src/options.spec.ts index 3c9435cc..132bf59a 100644 --- a/packages/nukak-browser/src/options.spec.ts +++ b/packages/nukak-browser/src/options.spec.ts @@ -1,6 +1,6 @@ -import { User } from 'nukak/test'; +import { User } from 'nukak/test/index.js'; import { getQuerier, getQuerierPool, setQuerierPool } from './options.js'; -import { GenericClientRepository, HttpQuerier } from './querier'; +import { GenericClientRepository, HttpQuerier } from './querier/index.js'; import { ClientQuerierPool } from './type/clientQuerierPool.js'; describe('options', () => { diff --git a/packages/nukak-browser/src/options.ts b/packages/nukak-browser/src/options.ts index fd0798d7..4288963b 100644 --- a/packages/nukak-browser/src/options.ts +++ b/packages/nukak-browser/src/options.ts @@ -1,5 +1,5 @@ import { HttpQuerier } from './querier/httpQuerier.js'; -import { ClientQuerier } from './type'; +import { ClientQuerier } from './type/index.js'; import { ClientQuerierPool } from './type/clientQuerierPool.js'; let defaultPool: ClientQuerierPool = { diff --git a/packages/nukak-browser/src/querier/genericClientRepository.ts b/packages/nukak-browser/src/querier/genericClientRepository.ts index a4355332..ff806aa1 100644 --- a/packages/nukak-browser/src/querier/genericClientRepository.ts +++ b/packages/nukak-browser/src/querier/genericClientRepository.ts @@ -1,5 +1,5 @@ -import { IdValue, Query, QueryCriteria, QueryOptions, QuerySearch, QueryUnique, Type } from 'nukak/type'; -import { ClientQuerier, ClientRepository, RequestOptions } from '../type'; +import { IdValue, Query, QueryCriteria, QueryOptions, QuerySearch, QueryUnique, Type } from 'nukak/type/index.js'; +import { ClientQuerier, ClientRepository, RequestOptions } from '../type/index.js'; export class GenericClientRepository implements ClientRepository { constructor(readonly entity: Type, readonly querier: ClientQuerier) {} diff --git a/packages/nukak-browser/src/querier/httpQuerier.ts b/packages/nukak-browser/src/querier/httpQuerier.ts index 035300fa..cf4cfaa2 100644 --- a/packages/nukak-browser/src/querier/httpQuerier.ts +++ b/packages/nukak-browser/src/querier/httpQuerier.ts @@ -1,8 +1,8 @@ -import { getMeta } from 'nukak/entity/decorator'; -import { IdValue, Query, QueryCriteria, QueryOne, QueryOptions, QuerySearch, QueryUnique, Type } from 'nukak/type'; -import { kebabCase } from 'nukak/util'; -import { RequestOptions, RequestFindOptions, ClientQuerier, ClientRepository } from '../type'; -import { get, post, patch, remove } from '../http'; +import { getMeta } from 'nukak/entity/decorator/definition.js'; +import { IdValue, Query, QueryCriteria, QueryOne, QueryOptions, QuerySearch, QueryUnique, Type } from 'nukak/type/index.js'; +import { kebabCase } from 'nukak/util/index.js'; +import { RequestOptions, RequestFindOptions, ClientQuerier, ClientRepository } from '../type/index.js'; +import { get, post, patch, remove } from '../http/index.js'; import { stringifyQuery } from './querier.util.js'; import { GenericClientRepository } from './genericClientRepository.js'; diff --git a/packages/nukak-browser/src/querier/querier.util.spec.ts b/packages/nukak-browser/src/querier/querier.util.spec.ts index 7dc890f9..98a6234d 100644 --- a/packages/nukak-browser/src/querier/querier.util.spec.ts +++ b/packages/nukak-browser/src/querier/querier.util.spec.ts @@ -1,5 +1,5 @@ -import { Query } from 'nukak/type'; -import { Item, User } from 'nukak/test'; +import { Query } from 'nukak/type/index.js'; +import { Item, User } from 'nukak/test/index.js'; import { stringifyQuery, stringifyQueryParameter } from './querier.util.js'; it('stringifyQuery -- empty', () => { diff --git a/packages/nukak-browser/src/querier/querier.util.ts b/packages/nukak-browser/src/querier/querier.util.ts index 4a257e40..0ff528ab 100644 --- a/packages/nukak-browser/src/querier/querier.util.ts +++ b/packages/nukak-browser/src/querier/querier.util.ts @@ -1,4 +1,4 @@ -import { getKeys } from 'nukak/util'; +import { getKeys } from 'nukak/util/index.js'; export function stringifyQueryParameter(key: string, value?: any, useQuestionMark?: boolean): string { const valStr = typeof value === 'object' && value !== null ? JSON.stringify(value) : value; diff --git a/packages/nukak-browser/src/type/clientQuerier.ts b/packages/nukak-browser/src/type/clientQuerier.ts index dfcc042e..6f9b12a5 100644 --- a/packages/nukak-browser/src/type/clientQuerier.ts +++ b/packages/nukak-browser/src/type/clientQuerier.ts @@ -1,4 +1,4 @@ -import { Query, Type, UniversalQuerier, QueryCriteria, QueryOptions, QuerySearch, IdValue, QueryUnique } from 'nukak/type'; +import { Query, Type, UniversalQuerier, QueryCriteria, QueryOptions, QuerySearch, IdValue, QueryUnique } from 'nukak/type/index.js'; import { ClientRepository } from './clientRepository.js'; import { RequestOptions, RequestSuccessResponse } from './request.js'; diff --git a/packages/nukak-browser/src/type/clientRepository.ts b/packages/nukak-browser/src/type/clientRepository.ts index e1a9862d..171b6a39 100644 --- a/packages/nukak-browser/src/type/clientRepository.ts +++ b/packages/nukak-browser/src/type/clientRepository.ts @@ -1,4 +1,4 @@ -import { Query, UniversalRepository, QueryCriteria, QueryOptions, QuerySearch, IdValue, QueryUnique } from 'nukak/type'; +import { Query, UniversalRepository, QueryCriteria, QueryOptions, QuerySearch, IdValue, QueryUnique } from 'nukak/type/index.js'; import { RequestOptions, RequestSuccessResponse } from './request.js'; export interface ClientRepository extends UniversalRepository { diff --git a/packages/nukak-browser/tsconfig.json b/packages/nukak-browser/tsconfig.json index f3e48180..f947925c 100644 --- a/packages/nukak-browser/tsconfig.json +++ b/packages/nukak-browser/tsconfig.json @@ -1,4 +1,5 @@ { + "$schema": "http://json.schemastore.org/tsconfig", "extends": "../../tsconfig.json", "compilerOptions": { "target": "ES2020", diff --git a/packages/nukak-browser/webpack.config.ts b/packages/nukak-browser/webpack.config.ts index d0f994bf..c1051c99 100644 --- a/packages/nukak-browser/webpack.config.ts +++ b/packages/nukak-browser/webpack.config.ts @@ -2,9 +2,10 @@ import { resolve } from 'node:path'; import { Compiler, Configuration } from 'webpack'; import ResolveTypeScriptPlugin from 'resolve-typescript-plugin'; +import tsconfig from '../../tsconfig.json' assert { type: 'json' }; const parentDir = '../../'; -const tsPathAliases = require(`${parentDir}tsconfig.json`).compilerOptions.paths; +const tsPathAliases = tsconfig.compilerOptions.paths; const entryName = 'nukak-browser.min'; const outDir = 'dist'; type Mode = 'development' | 'production'; @@ -12,24 +13,24 @@ const mode = (process.env.NODE_ENV as Mode) ?? 'development'; const isProductionMode = mode === 'production'; console.debug('*** mode', mode); -class DtsBundlePlugin { - apply(compiler: Compiler) { - compiler.hooks.done.tapAsync('DtsBundlePlugin', () => { - const rootDir = resolve(__dirname); - const dts = require('dts-bundle'); - const rimraf = require('rimraf'); +// class DtsBundlePlugin { +// apply(compiler: Compiler) { +// compiler.hooks.done.tapAsync('DtsBundlePlugin', () => { +// const rootDir = resolve(__dirname); +// const dts = require('dts-bundle'); +// const rimraf = require('rimraf'); - dts.bundle({ - name: 'nukak', - main: `${rootDir}/${outDir}/nukak-browser/**/*.d.ts`, - out: `${rootDir}/${outDir}/${entryName}.d.ts`, - outputAsModuleFolder: true, - }); +// dts.bundle({ +// name: 'nukak', +// main: `${rootDir}/${outDir}/nukak-browser/**/*.d.ts`, +// out: `${rootDir}/${outDir}/${entryName}.d.ts`, +// outputAsModuleFolder: true, +// }); - rimraf.sync(`${outDir}/{core,client}`); - }); - } -} +// rimraf.sync(`${outDir}/{core,client}`); +// }); +// } +// } const config: Configuration = { mode, @@ -71,7 +72,7 @@ const config: Configuration = { ], }, - plugins: [new DtsBundlePlugin()], + // plugins: [new DtsBundlePlugin()], }; function buildAlias() { @@ -83,4 +84,4 @@ function buildAlias() { }, {}); } -module.exports = config; +export default config; diff --git a/packages/nukak-express/src/querierMiddleware.ts b/packages/nukak-express/src/querierMiddleware.ts index 2a3f5c5d..7efed448 100644 --- a/packages/nukak-express/src/querierMiddleware.ts +++ b/packages/nukak-express/src/querierMiddleware.ts @@ -2,7 +2,7 @@ import { Request } from 'express-serve-static-core'; import { Router as expressRouter } from 'express'; import { getQuerier } from 'nukak/options'; -import { EntityMeta, IdValue, Query, QueryOne, QueryUnique, Type } from 'nukak/type'; +import { EntityMeta, IdValue, Query, QueryOne, QueryUnique, Type } from 'nukak/type/index.js'; import { kebabCase } from 'nukak/util'; import { getEntities, getMeta } from 'nukak/entity/decorator'; import { parseQuery } from './query.util.js'; diff --git a/packages/nukak-express/src/query.util.spec.ts b/packages/nukak-express/src/query.util.spec.ts index 6bb16346..ffb3ae45 100644 --- a/packages/nukak-express/src/query.util.spec.ts +++ b/packages/nukak-express/src/query.util.spec.ts @@ -1,4 +1,4 @@ -import { Query, QueryFilter, QueryStringified } from 'nukak/type'; +import { Query, QueryFilter, QueryStringified } from 'nukak/type/index.js'; import { Item } from 'nukak/test'; import { parseQuery } from './query.util.js'; diff --git a/packages/nukak-express/src/query.util.ts b/packages/nukak-express/src/query.util.ts index 5332ea3c..0d9de23e 100644 --- a/packages/nukak-express/src/query.util.ts +++ b/packages/nukak-express/src/query.util.ts @@ -1,4 +1,4 @@ -import { Query, QueryStringified } from 'nukak/type'; +import { Query, QueryStringified } from 'nukak/type/index.js'; export function parseQuery(qmsSrc?: QueryStringified): Query { const qm: Query = {}; diff --git a/packages/nukak-express/tsconfig.json b/packages/nukak-express/tsconfig.json index 27be44e7..5bbef82a 100644 --- a/packages/nukak-express/tsconfig.json +++ b/packages/nukak-express/tsconfig.json @@ -1,4 +1,5 @@ { + "$schema": "http://json.schemastore.org/tsconfig", "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "dist" diff --git a/packages/nukak/src/dialect/abstractSqlDialect-spec.ts b/packages/nukak/src/dialect/abstractSqlDialect-spec.ts index f97874c9..6b868a25 100644 --- a/packages/nukak/src/dialect/abstractSqlDialect-spec.ts +++ b/packages/nukak/src/dialect/abstractSqlDialect-spec.ts @@ -1,5 +1,5 @@ import { Company, InventoryAdjustment, Item, ItemAdjustment, MeasureUnit, Profile, Spec, Tax, TaxCategory, User } from '../test'; -import { FieldKey, QueryFilter } from '../type'; +import { FieldKey, QueryFilter } from '../type/index.js'; import { raw } from '../util'; import { AbstractSqlDialect } from './abstractSqlDialect.js'; diff --git a/packages/nukak/src/dialect/abstractSqlDialect.ts b/packages/nukak/src/dialect/abstractSqlDialect.ts index 48cea7e9..161f04ad 100644 --- a/packages/nukak/src/dialect/abstractSqlDialect.ts +++ b/packages/nukak/src/dialect/abstractSqlDialect.ts @@ -22,7 +22,7 @@ import { QuerySortDirection, QueryFilterLogical, QueryRaw, -} from '../type'; +} from '../type/index.js'; import { getPersistable, getProjectRelationKeys, diff --git a/packages/nukak/src/dialect/mysqlDialect.ts b/packages/nukak/src/dialect/mysqlDialect.ts index 028af606..67dcad84 100644 --- a/packages/nukak/src/dialect/mysqlDialect.ts +++ b/packages/nukak/src/dialect/mysqlDialect.ts @@ -1,5 +1,5 @@ import { getMeta } from '../entity/decorator'; -import { QueryComparisonOptions, QueryFilterMap, QueryTextSearchOptions, Type } from '../type'; +import { QueryComparisonOptions, QueryFilterMap, QueryTextSearchOptions, Type } from '../type/index.js'; import { AbstractSqlDialect } from './abstractSqlDialect.js'; export class MySqlDialect extends AbstractSqlDialect { diff --git a/packages/nukak/src/dialect/postgresDialect.ts b/packages/nukak/src/dialect/postgresDialect.ts index 3e89f465..cb0263ce 100644 --- a/packages/nukak/src/dialect/postgresDialect.ts +++ b/packages/nukak/src/dialect/postgresDialect.ts @@ -1,4 +1,12 @@ -import { QueryComparisonOptions, QueryFilterMap, QueryOptions, QueryFilterFieldOperatorMap, QueryTextSearchOptions, Type, FieldKey } from '../type'; +import { + QueryComparisonOptions, + QueryFilterMap, + QueryOptions, + QueryFilterFieldOperatorMap, + QueryTextSearchOptions, + Type, + FieldKey, +} from '../type/index.js'; import { getMeta } from '../entity/decorator'; import { AbstractSqlDialect } from './abstractSqlDialect.js'; diff --git a/packages/nukak/src/entity/decorator/definition.spec.ts b/packages/nukak/src/entity/decorator/definition.spec.ts index cfa29ba2..00e0ce97 100644 --- a/packages/nukak/src/entity/decorator/definition.spec.ts +++ b/packages/nukak/src/entity/decorator/definition.spec.ts @@ -14,7 +14,7 @@ import { Tag, ItemTag, } from '../../test'; -import { EntityGetter, EntityMeta, OnFieldCallback, QueryRaw, QueryRawFn } from '../../type'; +import { EntityGetter, EntityMeta, OnFieldCallback, QueryRaw, QueryRawFn } from '../../type/index.js'; import { getEntities, getMeta } from './definition.js'; import { Entity } from './entity.js'; import { Id } from './id.js'; diff --git a/packages/nukak/src/entity/decorator/definition.ts b/packages/nukak/src/entity/decorator/definition.ts index e8efa171..ba85e55f 100644 --- a/packages/nukak/src/entity/decorator/definition.ts +++ b/packages/nukak/src/entity/decorator/definition.ts @@ -1,5 +1,16 @@ import 'reflect-metadata'; -import { RelationOptions, FieldOptions, EntityOptions, EntityMeta, Type, RelationKeyMap, RelationKey, Key, FieldKey, IdKey } from '../../type'; +import { + RelationOptions, + FieldOptions, + EntityOptions, + EntityMeta, + Type, + RelationKeyMap, + RelationKey, + Key, + FieldKey, + IdKey, +} from '../../type/index.js'; import { hasKeys, lowerFirst, getKeys, upperFirst } from '../../util'; const holder = globalThis; diff --git a/packages/nukak/src/entity/decorator/entity.ts b/packages/nukak/src/entity/decorator/entity.ts index 54fdad04..e915358b 100644 --- a/packages/nukak/src/entity/decorator/entity.ts +++ b/packages/nukak/src/entity/decorator/entity.ts @@ -1,4 +1,4 @@ -import { EntityOptions, Type } from '../../type'; +import { EntityOptions, Type } from '../../type/index.js'; import { defineEntity } from './definition.js'; export function Entity(opts?: EntityOptions) { diff --git a/packages/nukak/src/entity/decorator/field.ts b/packages/nukak/src/entity/decorator/field.ts index d0d8b92d..c6df4850 100644 --- a/packages/nukak/src/entity/decorator/field.ts +++ b/packages/nukak/src/entity/decorator/field.ts @@ -1,4 +1,4 @@ -import { FieldOptions, Type } from '../../type'; +import { FieldOptions, Type } from '../../type/index.js'; import { defineField } from './definition.js'; export function Field(opts?: FieldOptions) { diff --git a/packages/nukak/src/entity/decorator/id.ts b/packages/nukak/src/entity/decorator/id.ts index 22c13dca..680fcebd 100644 --- a/packages/nukak/src/entity/decorator/id.ts +++ b/packages/nukak/src/entity/decorator/id.ts @@ -1,4 +1,4 @@ -import { FieldOptions, Type } from '../../type'; +import { FieldOptions, Type } from '../../type/index.js'; import { defineId } from './definition.js'; export function Id(opts?: Omit) { diff --git a/packages/nukak/src/entity/decorator/relation.ts b/packages/nukak/src/entity/decorator/relation.ts index fac0935a..0a39bc56 100644 --- a/packages/nukak/src/entity/decorator/relation.ts +++ b/packages/nukak/src/entity/decorator/relation.ts @@ -5,7 +5,7 @@ import { RelationManyToOneOptions, RelationManyToManyOptions, Type, -} from '../../type'; +} from '../../type/index.js'; import { defineRelation } from './definition.js'; function Relation(opts: RelationOptions) { diff --git a/packages/nukak/src/index.ts b/packages/nukak/src/index.ts index ef647d09..f4106f91 100644 --- a/packages/nukak/src/index.ts +++ b/packages/nukak/src/index.ts @@ -1,2 +1,2 @@ export * from './options.js'; -export * from './type'; +export * from './type/index.js'; diff --git a/packages/nukak/src/maria/mariadbQuerier.ts b/packages/nukak/src/maria/mariadbQuerier.ts index f5739266..5c31865e 100644 --- a/packages/nukak/src/maria/mariadbQuerier.ts +++ b/packages/nukak/src/maria/mariadbQuerier.ts @@ -1,6 +1,6 @@ import { PoolConnection } from 'mariadb'; -import { QuerierLogger, QueryUpdateResult } from 'nukak/type'; +import { QuerierLogger, QueryUpdateResult } from 'nukak/type/index.js'; import { AbstractSqlQuerier } from 'nukak/querier'; import { MySqlDialect } from 'nukak/dialect'; diff --git a/packages/nukak/src/maria/mariadbQuerierPool.ts b/packages/nukak/src/maria/mariadbQuerierPool.ts index 8e4222ab..598c20f0 100644 --- a/packages/nukak/src/maria/mariadbQuerierPool.ts +++ b/packages/nukak/src/maria/mariadbQuerierPool.ts @@ -1,5 +1,5 @@ import { createPool, Pool, PoolConfig } from 'mariadb'; -import { QuerierLogger, QuerierPool } from 'nukak/type'; +import { QuerierLogger, QuerierPool } from 'nukak/type/index.js'; import { MariadbQuerier } from './mariadbQuerier.js'; export class MariadbQuerierPool implements QuerierPool { diff --git a/packages/nukak/src/mongo/mongoDialect.ts b/packages/nukak/src/mongo/mongoDialect.ts index a6024235..9e5d0673 100644 --- a/packages/nukak/src/mongo/mongoDialect.ts +++ b/packages/nukak/src/mongo/mongoDialect.ts @@ -1,5 +1,16 @@ import { Filter, ObjectId, Sort } from 'mongodb'; -import { QueryFilter, Query, EntityMeta, Type, QueryProject, QueryProjectMap, QueryOptions, QuerySort, FieldValue, RelationKey } from 'nukak/type'; +import { + QueryFilter, + Query, + EntityMeta, + Type, + QueryProject, + QueryProjectMap, + QueryOptions, + QuerySort, + FieldValue, + RelationKey, +} from 'nukak/type/index.js'; import { getMeta } from 'nukak/entity/decorator'; import { getKeys, hasKeys, buildSortMap, getProjectRelationKeys, getQueryFilterAsMap } from 'nukak/util'; diff --git a/packages/nukak/src/mongo/mongodbQuerier.ts b/packages/nukak/src/mongo/mongodbQuerier.ts index 55b6424c..030d2c7a 100644 --- a/packages/nukak/src/mongo/mongodbQuerier.ts +++ b/packages/nukak/src/mongo/mongodbQuerier.ts @@ -1,5 +1,5 @@ import { MongoClient, ClientSession, UpdateFilter, Document } from 'mongodb'; -import { Query, Type, QueryCriteria, QueryOptions, QuerySearch, IdValue, QuerierLogger, QueryUnique } from 'nukak/type'; +import { Query, Type, QueryCriteria, QueryOptions, QuerySearch, IdValue, QuerierLogger, QueryUnique } from 'nukak/type/index.js'; import { AbstractQuerier } from 'nukak/querier'; import { getMeta } from 'nukak/entity/decorator'; import { clone, getPersistable, getPersistables, getFieldCallbackValue, hasKeys, isProjectingRelations } from 'nukak/util'; diff --git a/packages/nukak/src/mongo/mongodbQuerierPool.ts b/packages/nukak/src/mongo/mongodbQuerierPool.ts index e592b4f2..fee00366 100644 --- a/packages/nukak/src/mongo/mongodbQuerierPool.ts +++ b/packages/nukak/src/mongo/mongodbQuerierPool.ts @@ -1,5 +1,5 @@ import { MongoClient, MongoClientOptions } from 'mongodb'; -import { QuerierLogger, QuerierPool } from 'nukak/type'; +import { QuerierLogger, QuerierPool } from 'nukak/type/index.js'; import { MongodbQuerier } from './mongodbQuerier.js'; import { MongoDialect } from './mongoDialect.js'; diff --git a/packages/nukak/src/mysql/mysql2Querier.ts b/packages/nukak/src/mysql/mysql2Querier.ts index 2183274a..a43f5f33 100644 --- a/packages/nukak/src/mysql/mysql2Querier.ts +++ b/packages/nukak/src/mysql/mysql2Querier.ts @@ -1,6 +1,6 @@ import { PoolConnection } from 'mysql2/promise'; -import { QuerierLogger, QueryUpdateResult } from 'nukak/type'; +import { QuerierLogger, QueryUpdateResult } from 'nukak/type/index.js'; import { AbstractSqlQuerier } from 'nukak/querier'; import { MySqlDialect } from 'nukak/dialect'; diff --git a/packages/nukak/src/mysql/mysql2QuerierPool.ts b/packages/nukak/src/mysql/mysql2QuerierPool.ts index 300dd444..f52cbad3 100644 --- a/packages/nukak/src/mysql/mysql2QuerierPool.ts +++ b/packages/nukak/src/mysql/mysql2QuerierPool.ts @@ -1,5 +1,5 @@ import { createPool, Pool, PoolOptions } from 'mysql2/promise'; -import { QuerierLogger, QuerierPool } from 'nukak/type'; +import { QuerierLogger, QuerierPool } from 'nukak/type/index.js'; import { MySql2Querier } from './mysql2Querier.js'; export class MySql2QuerierPool implements QuerierPool { diff --git a/packages/nukak/src/options.spec.ts b/packages/nukak/src/options.spec.ts index e6124ea4..80caaa09 100644 --- a/packages/nukak/src/options.spec.ts +++ b/packages/nukak/src/options.spec.ts @@ -1,6 +1,6 @@ import { getQuerier, getQuerierPool, setQuerierPool } from './options.js'; import { User } from './test'; -import { Querier, Repository } from './type'; +import { Querier, Repository } from './type/index.js'; describe('options', () => { beforeEach(() => { diff --git a/packages/nukak/src/options.ts b/packages/nukak/src/options.ts index dd5d800b..8f0f4ede 100644 --- a/packages/nukak/src/options.ts +++ b/packages/nukak/src/options.ts @@ -1,4 +1,4 @@ -import { Querier, QuerierPool } from './type'; +import { Querier, QuerierPool } from './type/index.js'; let defaultPool: QuerierPool; diff --git a/packages/nukak/src/postgres/pgQuerier.ts b/packages/nukak/src/postgres/pgQuerier.ts index 422f2300..7f4289c1 100644 --- a/packages/nukak/src/postgres/pgQuerier.ts +++ b/packages/nukak/src/postgres/pgQuerier.ts @@ -1,6 +1,6 @@ import { PoolClient } from 'pg'; -import { QuerierLogger, QueryUpdateResult } from 'nukak/type'; +import { QuerierLogger, QueryUpdateResult } from 'nukak/type/index.js'; import { AbstractSqlQuerier } from 'nukak/querier'; import { PostgresDialect } from 'nukak/dialect'; diff --git a/packages/nukak/src/postgres/pgQuerierPool.ts b/packages/nukak/src/postgres/pgQuerierPool.ts index ab81aade..38c87b1a 100644 --- a/packages/nukak/src/postgres/pgQuerierPool.ts +++ b/packages/nukak/src/postgres/pgQuerierPool.ts @@ -1,5 +1,5 @@ import { Pool, PoolConfig } from 'pg'; -import { QuerierLogger, QuerierPool } from 'nukak/type'; +import { QuerierLogger, QuerierPool } from 'nukak/type/index.js'; import { PgQuerier } from './pgQuerier.js'; export class PgQuerierPool implements QuerierPool { diff --git a/packages/nukak/src/querier/abstractQuerier-it.ts b/packages/nukak/src/querier/abstractQuerier-it.ts index b319031b..19192ff5 100644 --- a/packages/nukak/src/querier/abstractQuerier-it.ts +++ b/packages/nukak/src/querier/abstractQuerier-it.ts @@ -1,6 +1,6 @@ import { getEntities } from '../entity'; import { Company, InventoryAdjustment, Item, ItemAdjustment, LedgerAccount, MeasureUnit, Spec, Tag, TaxCategory, User } from '../test'; -import { Querier, QuerierPool } from '../type'; +import { Querier, QuerierPool } from '../type/index.js'; export abstract class AbstractQuerierIt implements Spec { querier: Q; diff --git a/packages/nukak/src/querier/abstractQuerier.ts b/packages/nukak/src/querier/abstractQuerier.ts index 69de2bff..2e6fa10b 100644 --- a/packages/nukak/src/querier/abstractQuerier.ts +++ b/packages/nukak/src/querier/abstractQuerier.ts @@ -12,7 +12,7 @@ import { RelationValue, Repository, Type, -} from '../type'; +} from '../type/index.js'; import { getMeta } from '../entity'; import { clone, getKeys, getProjectRelationKeys, getPersistableRelations } from '../util'; import { GenericRepository } from '../repository'; diff --git a/packages/nukak/src/querier/abstractSqlQuerier-it.ts b/packages/nukak/src/querier/abstractSqlQuerier-it.ts index 4fdc5173..fa59bf8c 100644 --- a/packages/nukak/src/querier/abstractSqlQuerier-it.ts +++ b/packages/nukak/src/querier/abstractSqlQuerier-it.ts @@ -1,5 +1,5 @@ import { createTables, dropTables } from '../test'; -import { QuerierPool } from '../type'; +import { QuerierPool } from '../type/index.js'; import { AbstractQuerierIt } from './abstractQuerier-it.js'; import { AbstractSqlQuerier } from './abstractSqlQuerier.js'; diff --git a/packages/nukak/src/querier/abstractSqlQuerier-spec.ts b/packages/nukak/src/querier/abstractSqlQuerier-spec.ts index 128dcca7..440d34f1 100644 --- a/packages/nukak/src/querier/abstractSqlQuerier-spec.ts +++ b/packages/nukak/src/querier/abstractSqlQuerier-spec.ts @@ -1,6 +1,6 @@ import { raw } from '../util'; import { User, InventoryAdjustment, Spec, Item, Tag, MeasureUnit, dropTables, createTables, clearTables } from '../test'; -import { QuerierPool } from '../type'; +import { QuerierPool } from '../type/index.js'; import { AbstractSqlQuerier } from './abstractSqlQuerier.js'; export abstract class AbstractSqlQuerierSpec implements Spec { diff --git a/packages/nukak/src/querier/abstractSqlQuerier.ts b/packages/nukak/src/querier/abstractSqlQuerier.ts index ea9c4fa4..7dedcd54 100644 --- a/packages/nukak/src/querier/abstractSqlQuerier.ts +++ b/packages/nukak/src/querier/abstractSqlQuerier.ts @@ -1,4 +1,4 @@ -import { Query, Type, QueryCriteria, QueryOptions, QueryUpdateResult } from '../type'; +import { Query, Type, QueryCriteria, QueryOptions, QueryUpdateResult } from '../type/index.js'; import { unflatObjects, clone } from '../util'; import { AbstractSqlDialect } from '../dialect'; import { getMeta } from '../entity'; diff --git a/packages/nukak/src/querier/decorator/injectQuerier.spec.ts b/packages/nukak/src/querier/decorator/injectQuerier.spec.ts index b95d9a9e..1e4651fc 100644 --- a/packages/nukak/src/querier/decorator/injectQuerier.spec.ts +++ b/packages/nukak/src/querier/decorator/injectQuerier.spec.ts @@ -1,4 +1,4 @@ -import { Querier } from '../../type'; +import { Querier } from '../../type/index.js'; import { getInjectedQuerierIndex, InjectQuerier } from './injectQuerier.js'; describe('injectQuerier', () => { diff --git a/packages/nukak/src/querier/decorator/injectQuerier.ts b/packages/nukak/src/querier/decorator/injectQuerier.ts index 2da29f18..c7875cf4 100644 --- a/packages/nukak/src/querier/decorator/injectQuerier.ts +++ b/packages/nukak/src/querier/decorator/injectQuerier.ts @@ -1,4 +1,4 @@ -import { Key, Type } from '../../type'; +import { Key, Type } from '../../type/index.js'; const metadataKey = Symbol('InjectQuerier'); diff --git a/packages/nukak/src/querier/decorator/transactional.spec.ts b/packages/nukak/src/querier/decorator/transactional.spec.ts index f87e5406..6322e0fb 100644 --- a/packages/nukak/src/querier/decorator/transactional.spec.ts +++ b/packages/nukak/src/querier/decorator/transactional.spec.ts @@ -1,5 +1,5 @@ import { getQuerier, setQuerierPool } from '../../options'; -import { Querier, QuerierPool, Writable } from '../../type'; +import { Querier, QuerierPool, Writable } from '../../type/index.js'; import { InjectQuerier } from './injectQuerier.js'; import { Transactional } from './transactional.js'; diff --git a/packages/nukak/src/querier/decorator/transactional.ts b/packages/nukak/src/querier/decorator/transactional.ts index 65b2a396..4c315337 100644 --- a/packages/nukak/src/querier/decorator/transactional.ts +++ b/packages/nukak/src/querier/decorator/transactional.ts @@ -1,4 +1,4 @@ -import { Querier, QuerierPool, Type } from '../../type'; +import { Querier, QuerierPool, Type } from '../../type/index.js'; import { getQuerierPool } from '../../options'; import { getInjectedQuerierIndex } from './injectQuerier.js'; diff --git a/packages/nukak/src/repository/genericRepository.spec.ts b/packages/nukak/src/repository/genericRepository.spec.ts index a6747997..9ccaf347 100644 --- a/packages/nukak/src/repository/genericRepository.spec.ts +++ b/packages/nukak/src/repository/genericRepository.spec.ts @@ -1,4 +1,4 @@ -import { Querier, Repository } from '../type'; +import { Querier, Repository } from '../type/index.js'; import { User } from '../test'; import { GenericRepository } from './genericRepository.js'; diff --git a/packages/nukak/src/repository/genericRepository.ts b/packages/nukak/src/repository/genericRepository.ts index 0a94770f..688d8e9e 100644 --- a/packages/nukak/src/repository/genericRepository.ts +++ b/packages/nukak/src/repository/genericRepository.ts @@ -1,4 +1,4 @@ -import { IdValue, Querier, Query, QueryCriteria, QueryOne, QueryOptions, QuerySearch, QueryUnique, Repository, Type } from '../type'; +import { IdValue, Querier, Query, QueryCriteria, QueryOne, QueryOptions, QuerySearch, QueryUnique, Repository, Type } from '../type/index.js'; export class GenericRepository implements Repository { constructor(readonly entity: Type, readonly querier: Querier) {} diff --git a/packages/nukak/src/test/entityMock.ts b/packages/nukak/src/test/entityMock.ts index 1ecab586..3c8c7d8a 100644 --- a/packages/nukak/src/test/entityMock.ts +++ b/packages/nukak/src/test/entityMock.ts @@ -1,6 +1,6 @@ import { v4 as uuidv4 } from 'uuid'; import { raw } from '../util'; -import { idKey } from '../type'; +import { idKey } from '../type/index.js'; import { Field, ManyToOne, Id, OneToMany, Entity, OneToOne, ManyToMany } from '../entity'; /** diff --git a/packages/nukak/src/test/it.util.ts b/packages/nukak/src/test/it.util.ts index e6f3a45e..ad286d0b 100644 --- a/packages/nukak/src/test/it.util.ts +++ b/packages/nukak/src/test/it.util.ts @@ -1,6 +1,6 @@ import { getKeys } from '../util'; import { AbstractSqlQuerier } from '../querier'; -import { Type } from '../type'; +import { Type } from '../type/index.js'; import { getEntities, getMeta } from '../entity/decorator'; export async function createTables(querier: AbstractSqlQuerier, primaryKeyType: string) { diff --git a/packages/nukak/src/util/dialect.util.ts b/packages/nukak/src/util/dialect.util.ts index cf5fd307..513594f3 100644 --- a/packages/nukak/src/util/dialect.util.ts +++ b/packages/nukak/src/util/dialect.util.ts @@ -15,7 +15,7 @@ import { QueryFilterMap, OnFieldCallback, MongoId, -} from '../type'; +} from '../type/index.js'; type CallbackKey = keyof Pick; diff --git a/packages/nukak/src/util/raw.ts b/packages/nukak/src/util/raw.ts index f06ccd6a..aeb01f5f 100644 --- a/packages/nukak/src/util/raw.ts +++ b/packages/nukak/src/util/raw.ts @@ -1,4 +1,4 @@ -import { QueryRaw, QueryRawFn, Scalar } from '../type'; +import { QueryRaw, QueryRawFn, Scalar } from '../type/index.js'; export function raw(value: Scalar | QueryRawFn, alias?: string): QueryRaw { return new QueryRaw(value, alias); diff --git a/packages/nukak/src/util/sql.util.spec.ts b/packages/nukak/src/util/sql.util.spec.ts index 7e4e5904..52c7c047 100644 --- a/packages/nukak/src/util/sql.util.spec.ts +++ b/packages/nukak/src/util/sql.util.spec.ts @@ -1,5 +1,5 @@ import { Item, ItemAdjustment, Storehouse } from '../test'; -import { QuerySortMap } from '../type'; +import { QuerySortMap } from '../type/index.js'; import { flatObject, unflatObjects } from './sql.util.js'; it('flatObject', () => { diff --git a/tsconfig.test.json b/tsconfig.test.json index f0b4e4b2..a92f6013 100644 --- a/tsconfig.test.json +++ b/tsconfig.test.json @@ -1,4 +1,5 @@ { + "$schema": "http://json.schemastore.org/tsconfig", "extends": "./tsconfig.json", "compilerOptions": { "lib": ["ES2022", "DOM"] diff --git a/yarn.lock b/yarn.lock index 72ab642a..090022c0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2925,6 +2925,15 @@ cliui@^7.0.2: strip-ansi "^6.0.0" wrap-ansi "^7.0.0" +cliui@^8.0.1: + version "8.0.1" + resolved "https://registry.yarnpkg.com/cliui/-/cliui-8.0.1.tgz#0c04b075db02cbfe60dc8e6cf2f5486b1a3608aa" + integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ== + dependencies: + string-width "^4.2.0" + strip-ansi "^6.0.1" + wrap-ansi "^7.0.0" + clone-deep@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387" @@ -3368,6 +3377,14 @@ dot-prop@^5.1.0: dependencies: is-obj "^2.0.0" +dts-bundle-generator@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/dts-bundle-generator/-/dts-bundle-generator-7.0.0.tgz#9f8264f5ae17c7fef656dd535828326db32c87be" + integrity sha512-3mhkUvUsxYT5aK4NOJH9iCOMy04vLEeH2gemBD+rSAYn5x7OiLbzyAEzf6gix3jyx/0I9qjYJOja1pvnqBhKDQ== + dependencies: + typescript ">=4.5.2" + yargs "^17.6.0" + dts-bundle@^0.7.3: version "0.7.3" resolved "https://registry.yarnpkg.com/dts-bundle/-/dts-bundle-0.7.3.tgz#372b7bb69c820782e6382f400739a69dced3d59a" @@ -7399,16 +7416,16 @@ type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" +typescript@>=4.5.2, typescript@^4.9.3: + version "4.9.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.3.tgz#3aea307c1746b8c384435d8ac36b8a2e580d85db" + integrity sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA== + typescript@^4.6.4: version "4.7.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.2.tgz#1f9aa2ceb9af87cca227813b4310fff0b51593c4" integrity sha512-Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A== -typescript@^4.9.3: - version "4.9.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.3.tgz#3aea307c1746b8c384435d8ac36b8a2e580d85db" - integrity sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA== - unbox-primitive@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" @@ -7763,6 +7780,11 @@ yargs-parser@^21.0.1: resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35" integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg== +yargs-parser@^21.1.1: + version "21.1.1" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35" + integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw== + yargs@^16.1.0: version "16.2.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66" @@ -7802,6 +7824,19 @@ yargs@^17.3.1: y18n "^5.0.5" yargs-parser "^21.0.0" +yargs@^17.6.0: + version "17.6.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.6.2.tgz#2e23f2944e976339a1ee00f18c77fedee8332541" + integrity sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + yn@3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" From b73ad353df6e138d7b403e22369348984bc950d3 Mon Sep 17 00:00:00 2001 From: Roger Date: Fri, 18 Nov 2022 18:22:18 -0500 Subject: [PATCH 03/15] abuild: migrate packaging from commonjs to esm --- packages/nukak-browser/package.json | 1 - packages/nukak-browser/webpack.config.ts | 21 ------ yarn.lock | 94 ++---------------------- 3 files changed, 8 insertions(+), 108 deletions(-) diff --git a/packages/nukak-browser/package.json b/packages/nukak-browser/package.json index d39b8392..18731df7 100644 --- a/packages/nukak-browser/package.json +++ b/packages/nukak-browser/package.json @@ -18,7 +18,6 @@ "devDependencies": { "@types/webpack": "^5.28.0", "copyfiles": "^2.4.1", - "dts-bundle": "^0.7.3", "dts-bundle-generator": "^7.0.0", "nukak": "^0.0.4", "rimraf": "^3.0.2", diff --git a/packages/nukak-browser/webpack.config.ts b/packages/nukak-browser/webpack.config.ts index c1051c99..8365684d 100644 --- a/packages/nukak-browser/webpack.config.ts +++ b/packages/nukak-browser/webpack.config.ts @@ -13,25 +13,6 @@ const mode = (process.env.NODE_ENV as Mode) ?? 'development'; const isProductionMode = mode === 'production'; console.debug('*** mode', mode); -// class DtsBundlePlugin { -// apply(compiler: Compiler) { -// compiler.hooks.done.tapAsync('DtsBundlePlugin', () => { -// const rootDir = resolve(__dirname); -// const dts = require('dts-bundle'); -// const rimraf = require('rimraf'); - -// dts.bundle({ -// name: 'nukak', -// main: `${rootDir}/${outDir}/nukak-browser/**/*.d.ts`, -// out: `${rootDir}/${outDir}/${entryName}.d.ts`, -// outputAsModuleFolder: true, -// }); - -// rimraf.sync(`${outDir}/{core,client}`); -// }); -// } -// } - const config: Configuration = { mode, profile: true, @@ -71,8 +52,6 @@ const config: Configuration = { }, ], }, - - // plugins: [new DtsBundlePlugin()], }; function buildAlias() { diff --git a/yarn.lock b/yarn.lock index 090022c0..82fa7227 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1797,11 +1797,6 @@ dependencies: "@types/node" "*" -"@types/detect-indent@0.1.30": - version "0.1.30" - resolved "https://registry.yarnpkg.com/@types/detect-indent/-/detect-indent-0.1.30.tgz#dc682bb412b4e65ba098e70edad73b4833fb910d" - integrity sha512-AUmj9JHuHTD94slY1WR1VulFxRGC6D1pcNCN0MCulKFyiihvV/28lLS8oRHgfmc2Cxq954J8Vmosa8qzm7PLGQ== - "@types/eslint-scope@^3.7.3": version "3.7.3" resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224" @@ -1852,14 +1847,6 @@ resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.10.tgz#6dfbf5ea17142f7f9a043809f1cd4c448cb68249" integrity sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA== -"@types/glob@5.0.30": - version "5.0.30" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.30.tgz#1026409c5625a8689074602808d082b2867b8a51" - integrity sha512-ZM05wDByI+WA153sfirJyEHoYYoIuZ7lA2dB/Gl8ymmpMTR78fNRtDMqa7Z6SdH4fZdLWZNRE6mZpx3XqBOrHw== - dependencies: - "@types/minimatch" "*" - "@types/node" "*" - "@types/graceful-fs@^4.1.3": version "4.1.5" resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" @@ -1909,21 +1896,11 @@ resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a" integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw== -"@types/minimatch@*": - version "3.0.5" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" - integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== - "@types/minimist@^1.2.0": version "1.2.2" resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c" integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== -"@types/mkdirp@0.3.29": - version "0.3.29" - resolved "https://registry.yarnpkg.com/@types/mkdirp/-/mkdirp-0.3.29.tgz#7f2ad7ec55f914482fc9b1ec4bb1ae6028d46066" - integrity sha512-QRLQpFsIQGO2k8pupga9abfei85GKotAtQ+F6xuQmSGomUt6C52TyMiTFpP8kUwuPKr00gNtu3itLlC6gvI/NA== - "@types/mongodb@^4.0.6": version "4.0.7" resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-4.0.7.tgz#ebaa80c53b684ea52ccfe7721c0f5c9ef7b4f511" @@ -1943,11 +1920,6 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.12.tgz#f7aa331b27f08244888c47b7df126184bc2339c5" integrity sha512-4YpbAsnJXWYK/fpTVFlMIcUIho2AYCi4wg5aNPrG1ng7fn/1/RZfCIpRCiBX+12RVa34RluilnvCqD+g3KiSiA== -"@types/node@8.0.0": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.0.tgz#acaa89247afddc7967e9902fd11761dadea1a555" - integrity sha512-j2tekvJCO7j22cs+LO6i0kRPhmQ9MXaPZ55TzOc1lzkN5b6BWqq4AFjl04s1oRRQ1v5rSe+KEvnLUSTonuls/A== - "@types/node@^14.0.0": version "14.18.33" resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.33.tgz#8c29a0036771569662e4635790ffa9e057db379b" @@ -3009,7 +2981,7 @@ commander@2.15.1: resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" integrity sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag== -commander@^2.20.0, commander@^2.9.0: +commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -3316,14 +3288,6 @@ destroy@1.2.0: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015" integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg== -detect-indent@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-0.2.0.tgz#042914498979ac2d9f3c73e4ff3e6877d3bc92b6" - integrity sha512-C6jyrDu/eGH4KT0ZxAzijiH+ts5YLy7DqGFoDuHGxZjMOdjzRltp3jByySnpFBVIy4Em0ZkLN8tIV6mcREdw5A== - dependencies: - get-stdin "^0.1.0" - minimist "^0.1.0" - detect-libc@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" @@ -3385,20 +3349,6 @@ dts-bundle-generator@^7.0.0: typescript ">=4.5.2" yargs "^17.6.0" -dts-bundle@^0.7.3: - version "0.7.3" - resolved "https://registry.yarnpkg.com/dts-bundle/-/dts-bundle-0.7.3.tgz#372b7bb69c820782e6382f400739a69dced3d59a" - integrity sha512-EEAEuPRk8QyKhoN90NHTh+spSQujkkvOnKWUfuzpmC/fgryiWopL1SegSktx0UsoPfNidIGVDN7/AXpBDBv0WQ== - dependencies: - "@types/detect-indent" "0.1.30" - "@types/glob" "5.0.30" - "@types/mkdirp" "0.3.29" - "@types/node" "8.0.0" - commander "^2.9.0" - detect-indent "^0.2.0" - glob "^6.0.4" - mkdirp "^0.5.0" - ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" @@ -4100,11 +4050,6 @@ get-package-type@^0.1.0: resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a" integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q== -get-stdin@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-0.1.0.tgz#5998af24aafc802d15c82c685657eeb8b10d4a91" - integrity sha512-/WBu3IaQZxE3bs3BhBmR10ipDY4pjN+U4EZgXULa1eqKA0B/Lka/MVoAqhTVYBkkRlCrEGDOU9itrzIgm9Ksng== - get-stream@^6.0.0: version "6.0.1" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" @@ -4165,17 +4110,6 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@^6.0.4: - version "6.0.4" - resolved "https://registry.yarnpkg.com/glob/-/glob-6.0.4.tgz#0f08860f6a155127b2fadd4f9ce24b1aab6e4d22" - integrity sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A== - dependencies: - inflight "^1.0.4" - inherits "2" - minimatch "2 || 3" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@^7.0.5, glob@^7.1.3, glob@^7.1.4: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" @@ -5491,13 +5425,6 @@ min-indent@^1.0.0: resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg== -"minimatch@2 || 3", minimatch@^3.0.5, minimatch@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" - integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== - dependencies: - brace-expansion "^1.1.7" - minimatch@^3.0.3, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -5505,6 +5432,13 @@ minimatch@^3.0.3, minimatch@^3.0.4: dependencies: brace-expansion "^1.1.7" +minimatch@^3.0.5, minimatch@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" + integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw== + dependencies: + brace-expansion "^1.1.7" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -5514,11 +5448,6 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.1.0.tgz#99df657a52574c21c9057497df742790b2b4c0de" - integrity sha512-wR5Ipl99t0mTGwLjQJnBjrP/O7zBbLZqvA3aw32DmLx+nXHfWctUjzDjnDx09pX1Po86WFQazF9xUzfMea3Cnw== - minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" @@ -5588,13 +5517,6 @@ mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== -mkdirp@^0.5.0: - version "0.5.6" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" - integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== - dependencies: - minimist "^1.2.6" - mkdirp@^0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" From 074dd7f971612740595f048de63d71a3c63a998c Mon Sep 17 00:00:00 2001 From: Roger Date: Fri, 18 Nov 2022 18:24:34 -0500 Subject: [PATCH 04/15] v0.0.5 --- lerna.json | 2 +- packages/nukak-browser/package.json | 4 ++-- packages/nukak-express/package.json | 4 ++-- packages/nukak/package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lerna.json b/lerna.json index 1ae6db25..00b0ae51 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.0.4", + "version": "0.0.5", "useWorkspaces": true, "npmClient": "yarn", "npmClientArgs": ["--no-package-lock"], diff --git a/packages/nukak-browser/package.json b/packages/nukak-browser/package.json index 18731df7..93a7adc9 100644 --- a/packages/nukak-browser/package.json +++ b/packages/nukak-browser/package.json @@ -2,7 +2,7 @@ "name": "nukak-browser", "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", - "version": "0.0.4", + "version": "0.0.5", "type": "module", "main": "./nukak-browser.min.js", "exports": "./nukak-browser.min.js", @@ -19,7 +19,7 @@ "@types/webpack": "^5.28.0", "copyfiles": "^2.4.1", "dts-bundle-generator": "^7.0.0", - "nukak": "^0.0.4", + "nukak": "^0.0.5", "rimraf": "^3.0.2", "source-map-loader": "^4.0.1", "ts-loader": "^9.4.1", diff --git a/packages/nukak-express/package.json b/packages/nukak-express/package.json index a7ffba59..f66ea180 100644 --- a/packages/nukak-express/package.json +++ b/packages/nukak-express/package.json @@ -3,7 +3,7 @@ "homepage": "https://nukak.org", "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", - "version": "0.0.4", + "version": "0.0.5", "main": "./index.js", "exports": "./index.js", "types": "./index.d.ts", @@ -21,7 +21,7 @@ "@types/express": "4.17.14", "copyfiles": "^2.4.1", "express": "^4.18.2", - "nukak": "^0.0.4", + "nukak": "^0.0.5", "resolve-typescript-plugin": "^2.0.0", "rimraf": "^3.0.2", "typescript": "^4.9.3" diff --git a/packages/nukak/package.json b/packages/nukak/package.json index d097d854..8f9e914e 100644 --- a/packages/nukak/package.json +++ b/packages/nukak/package.json @@ -3,7 +3,7 @@ "homepage": "https://nukak.org", "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", - "version": "0.0.4", + "version": "0.0.5", "main": "./index.js", "exports": "./index.js", "types": "./index.d.ts", From 6b98859eae3f5eb9d18c28bd55c04489cdbe0106 Mon Sep 17 00:00:00 2001 From: Roger Date: Fri, 18 Nov 2022 19:36:33 -0500 Subject: [PATCH 05/15] abuild: migrate packaging from commonjs to esm --- jest.config.ts | 14 ++++++++++---- package.json | 2 ++ packages/nukak-browser/package.json | 2 +- packages/nukak-express/package.json | 3 ++- packages/nukak-express/src/querierMiddleware.ts | 6 +++--- packages/nukak-express/src/query.util.spec.ts | 2 +- packages/nukak/package.json | 3 ++- .../nukak/src/dialect/abstractSqlDialect-spec.ts | 4 ++-- packages/nukak/src/dialect/abstractSqlDialect.ts | 4 ++-- packages/nukak/src/dialect/mysqlDialect.spec.ts | 2 +- packages/nukak/src/dialect/mysqlDialect.ts | 2 +- packages/nukak/src/dialect/postgresDialect.spec.ts | 2 +- packages/nukak/src/dialect/postgresDialect.ts | 2 +- packages/nukak/src/dialect/sqliteDialect.spec.ts | 2 +- .../nukak/src/entity/decorator/definition.spec.ts | 2 +- packages/nukak/src/entity/decorator/definition.ts | 2 +- packages/nukak/src/entity/decorator/index.ts | 2 +- packages/nukak/src/entity/index.ts | 2 +- packages/nukak/src/maria/mariadbQuerier.it.ts | 4 ++-- packages/nukak/src/maria/mariadbQuerier.ts | 6 +++--- packages/nukak/src/maria/mariadbQuerierPool.ts | 2 +- packages/nukak/src/mongo/mongoDialect.spec.ts | 4 ++-- packages/nukak/src/mongo/mongoDialect.ts | 6 +++--- packages/nukak/src/mongo/mongodbQuerier.it.ts | 6 +++--- packages/nukak/src/mongo/mongodbQuerier.ts | 8 ++++---- packages/nukak/src/mongo/mongodbQuerierPool.ts | 2 +- packages/nukak/src/mysql/mysql2Querier.it.ts | 4 ++-- packages/nukak/src/mysql/mysql2Querier.ts | 6 +++--- packages/nukak/src/mysql/mysql2QuerierPool.ts | 2 +- packages/nukak/src/options.spec.ts | 2 +- packages/nukak/src/postgres/pgQuerier.it.ts | 4 ++-- packages/nukak/src/postgres/pgQuerier.ts | 6 +++--- packages/nukak/src/postgres/pgQuerierPool.ts | 2 +- packages/nukak/src/querier/abstractQuerier-it.ts | 4 ++-- packages/nukak/src/querier/abstractQuerier.ts | 6 +++--- .../nukak/src/querier/abstractSqlQuerier-it.ts | 2 +- .../nukak/src/querier/abstractSqlQuerier-spec.ts | 4 ++-- packages/nukak/src/querier/abstractSqlQuerier.ts | 6 +++--- .../src/querier/decorator/transactional.spec.ts | 2 +- .../nukak/src/querier/decorator/transactional.ts | 2 +- packages/nukak/src/querier/index.ts | 2 +- .../nukak/src/repository/genericRepository.spec.ts | 2 +- packages/nukak/src/test/entityMock.ts | 4 ++-- packages/nukak/src/test/it.util.ts | 6 +++--- packages/nukak/src/util/dialect.util.spec.ts | 4 ++-- packages/nukak/src/util/dialect.util.ts | 2 +- packages/nukak/src/util/sql.util.spec.ts | 2 +- 47 files changed, 90 insertions(+), 80 deletions(-) diff --git a/jest.config.ts b/jest.config.ts index e99edc5a..d5bbb326 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -1,3 +1,4 @@ +import type { JestConfigWithTsJest } from 'ts-jest'; import tsconfig from './tsconfig.json'; const tsConfigPaths = tsconfig.compilerOptions.paths; @@ -6,17 +7,21 @@ const moduleNameMapper = Object.keys(tsConfigPaths).reduce( (acc, key) => { const prop = '^' + key.replace('/*', '/(.*)') + '$'; acc[prop] = '/' + tsConfigPaths[key][0].replace('/*', '/$1'); + console.log(prop, acc); return acc; }, // sourced from https://kulshekhar.github.io/ts-jest/docs/guides/esm-support/#esm-presets { '^(\\.{1,2}/.*)\\.js$': '$1' } ); -module.exports = { +const jestConfig: JestConfigWithTsJest = { verbose: true, + extensionsToTreatAsEsm: ['.ts'], + // moduleNameMapper, + moduleNameMapper: { + '^(\\.{1,2}/.*)\\.js$': '$1', + }, transform: { - // '^.+\\.[tj]sx?$' to process js/ts with `ts-jest` - // '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest` '^.+\\.tsx?$': [ 'ts-jest', { @@ -33,5 +38,6 @@ module.exports = { coverageDirectory: 'coverage', coveragePathIgnorePatterns: ['node_modules', 'test'], modulePathIgnorePatterns: ['dist'], - moduleNameMapper, }; + +export default jestConfig; diff --git a/package.json b/package.json index 80604fbd..d5dbc986 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,7 @@ { "private": true, + "type": "module", + "sideEffects": false, "workspaces": [ "packages/*" ], diff --git a/packages/nukak-browser/package.json b/packages/nukak-browser/package.json index 93a7adc9..fb3b639c 100644 --- a/packages/nukak-browser/package.json +++ b/packages/nukak-browser/package.json @@ -5,8 +5,8 @@ "version": "0.0.5", "type": "module", "main": "./nukak-browser.min.js", - "exports": "./nukak-browser.min.js", "types": "./nukak-browser.min.d.ts", + "sideEffects": false, "scripts": { "copyfiles": "copyfiles -f package.json ../../README.md ../../CHANGELOG.md dist", "compile": "NODE_ENV=production node --loader ts-node/esm node_modules/.bin/webpack", diff --git a/packages/nukak-express/package.json b/packages/nukak-express/package.json index f66ea180..3d27ebdc 100644 --- a/packages/nukak-express/package.json +++ b/packages/nukak-express/package.json @@ -4,9 +4,10 @@ "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", "version": "0.0.5", + "type": "module", "main": "./index.js", - "exports": "./index.js", "types": "./index.d.ts", + "sideEffects": false, "scripts": { "copyfiles": "copyfiles -f package.json ../../README.md ../../CHANGELOG.md dist", "build": "yarn clean && tsc -b tsconfig.build.json && yarn copyfiles", diff --git a/packages/nukak-express/src/querierMiddleware.ts b/packages/nukak-express/src/querierMiddleware.ts index 7efed448..8d812c87 100644 --- a/packages/nukak-express/src/querierMiddleware.ts +++ b/packages/nukak-express/src/querierMiddleware.ts @@ -1,10 +1,10 @@ import { Request } from 'express-serve-static-core'; import { Router as expressRouter } from 'express'; -import { getQuerier } from 'nukak/options'; +import { getQuerier } from 'nukak/options.js'; import { EntityMeta, IdValue, Query, QueryOne, QueryUnique, Type } from 'nukak/type/index.js'; -import { kebabCase } from 'nukak/util'; -import { getEntities, getMeta } from 'nukak/entity/decorator'; +import { kebabCase } from 'nukak/util/index.js'; +import { getEntities, getMeta } from 'nukak/entity/decorator/index.js'; import { parseQuery } from './query.util.js'; export function querierMiddleware(opts: MiddlewareOptions = {}) { diff --git a/packages/nukak-express/src/query.util.spec.ts b/packages/nukak-express/src/query.util.spec.ts index ffb3ae45..e74f1c19 100644 --- a/packages/nukak-express/src/query.util.spec.ts +++ b/packages/nukak-express/src/query.util.spec.ts @@ -1,5 +1,5 @@ import { Query, QueryFilter, QueryStringified } from 'nukak/type/index.js'; -import { Item } from 'nukak/test'; +import { Item } from 'nukak/test/index.js'; import { parseQuery } from './query.util.js'; it('parseQuery -- empty', () => { diff --git a/packages/nukak/package.json b/packages/nukak/package.json index 8f9e914e..25b332d0 100644 --- a/packages/nukak/package.json +++ b/packages/nukak/package.json @@ -4,9 +4,10 @@ "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", "version": "0.0.5", + "type": "module", "main": "./index.js", - "exports": "./index.js", "types": "./index.d.ts", + "sideEffects": false, "scripts": { "copyfiles": "copyfiles -f package.json ../../README.md ../../CHANGELOG.md dist", "build": "yarn clean && tsc -b tsconfig.build.json && yarn copyfiles", diff --git a/packages/nukak/src/dialect/abstractSqlDialect-spec.ts b/packages/nukak/src/dialect/abstractSqlDialect-spec.ts index 6b868a25..66881c79 100644 --- a/packages/nukak/src/dialect/abstractSqlDialect-spec.ts +++ b/packages/nukak/src/dialect/abstractSqlDialect-spec.ts @@ -1,6 +1,6 @@ -import { Company, InventoryAdjustment, Item, ItemAdjustment, MeasureUnit, Profile, Spec, Tax, TaxCategory, User } from '../test'; +import { Company, InventoryAdjustment, Item, ItemAdjustment, MeasureUnit, Profile, Spec, Tax, TaxCategory, User } from '../test/index.js'; import { FieldKey, QueryFilter } from '../type/index.js'; -import { raw } from '../util'; +import { raw } from '../util/index.js'; import { AbstractSqlDialect } from './abstractSqlDialect.js'; export abstract class AbstractSqlDialectSpec implements Spec { diff --git a/packages/nukak/src/dialect/abstractSqlDialect.ts b/packages/nukak/src/dialect/abstractSqlDialect.ts index 161f04ad..d115de5e 100644 --- a/packages/nukak/src/dialect/abstractSqlDialect.ts +++ b/packages/nukak/src/dialect/abstractSqlDialect.ts @@ -36,9 +36,9 @@ import { raw, getQueryFilterAsMap, getFieldCallbackValue, -} from '../util'; +} from '../util/index.js'; -import { getMeta } from '../entity'; +import { getMeta } from '../entity/index.js'; export abstract class AbstractSqlDialect implements QueryDialect { readonly escapeIdRegex: RegExp; diff --git a/packages/nukak/src/dialect/mysqlDialect.spec.ts b/packages/nukak/src/dialect/mysqlDialect.spec.ts index 22df9400..f3814131 100644 --- a/packages/nukak/src/dialect/mysqlDialect.spec.ts +++ b/packages/nukak/src/dialect/mysqlDialect.spec.ts @@ -1,4 +1,4 @@ -import { createSpec, Item, User } from '../test'; +import { createSpec, Item, User } from '../test/index.js'; import { AbstractSqlDialectSpec } from './abstractSqlDialect-spec.js'; import { MySqlDialect } from './mysqlDialect.js'; diff --git a/packages/nukak/src/dialect/mysqlDialect.ts b/packages/nukak/src/dialect/mysqlDialect.ts index 67dcad84..6dabde95 100644 --- a/packages/nukak/src/dialect/mysqlDialect.ts +++ b/packages/nukak/src/dialect/mysqlDialect.ts @@ -1,4 +1,4 @@ -import { getMeta } from '../entity/decorator'; +import { getMeta } from '../entity/decorator/index.js'; import { QueryComparisonOptions, QueryFilterMap, QueryTextSearchOptions, Type } from '../type/index.js'; import { AbstractSqlDialect } from './abstractSqlDialect.js'; diff --git a/packages/nukak/src/dialect/postgresDialect.spec.ts b/packages/nukak/src/dialect/postgresDialect.spec.ts index d42bb699..18421e92 100644 --- a/packages/nukak/src/dialect/postgresDialect.spec.ts +++ b/packages/nukak/src/dialect/postgresDialect.spec.ts @@ -1,4 +1,4 @@ -import { User, Item, createSpec, TaxCategory } from '../test'; +import { User, Item, createSpec, TaxCategory } from '../test/index.js'; import { PostgresDialect } from './postgresDialect.js'; class PostgresDialectSpec { diff --git a/packages/nukak/src/dialect/postgresDialect.ts b/packages/nukak/src/dialect/postgresDialect.ts index cb0263ce..614c6228 100644 --- a/packages/nukak/src/dialect/postgresDialect.ts +++ b/packages/nukak/src/dialect/postgresDialect.ts @@ -7,7 +7,7 @@ import { Type, FieldKey, } from '../type/index.js'; -import { getMeta } from '../entity/decorator'; +import { getMeta } from '../entity/decorator/index.js'; import { AbstractSqlDialect } from './abstractSqlDialect.js'; export class PostgresDialect extends AbstractSqlDialect { diff --git a/packages/nukak/src/dialect/sqliteDialect.spec.ts b/packages/nukak/src/dialect/sqliteDialect.spec.ts index 3ae31394..df8692f7 100644 --- a/packages/nukak/src/dialect/sqliteDialect.spec.ts +++ b/packages/nukak/src/dialect/sqliteDialect.spec.ts @@ -1,4 +1,4 @@ -import { createSpec } from '../test'; +import { createSpec } from '../test/index.js'; import { AbstractSqlDialectSpec } from './abstractSqlDialect-spec.js'; import { SqliteDialect } from './sqliteDialect.js'; diff --git a/packages/nukak/src/entity/decorator/definition.spec.ts b/packages/nukak/src/entity/decorator/definition.spec.ts index 00e0ce97..702a427d 100644 --- a/packages/nukak/src/entity/decorator/definition.spec.ts +++ b/packages/nukak/src/entity/decorator/definition.spec.ts @@ -13,7 +13,7 @@ import { Storehouse, Tag, ItemTag, -} from '../../test'; +} from '../../test/index.js'; import { EntityGetter, EntityMeta, OnFieldCallback, QueryRaw, QueryRawFn } from '../../type/index.js'; import { getEntities, getMeta } from './definition.js'; import { Entity } from './entity.js'; diff --git a/packages/nukak/src/entity/decorator/definition.ts b/packages/nukak/src/entity/decorator/definition.ts index ba85e55f..102d79dd 100644 --- a/packages/nukak/src/entity/decorator/definition.ts +++ b/packages/nukak/src/entity/decorator/definition.ts @@ -11,7 +11,7 @@ import { FieldKey, IdKey, } from '../../type/index.js'; -import { hasKeys, lowerFirst, getKeys, upperFirst } from '../../util'; +import { hasKeys, lowerFirst, getKeys, upperFirst } from '../../util/index.js'; const holder = globalThis; const metaKey = 'nukak/entity/decorator'; diff --git a/packages/nukak/src/entity/decorator/index.ts b/packages/nukak/src/entity/decorator/index.ts index d4708f24..2f7f63c0 100644 --- a/packages/nukak/src/entity/decorator/index.ts +++ b/packages/nukak/src/entity/decorator/index.ts @@ -2,4 +2,4 @@ export * from './entity.js'; export * from './id.js'; export * from './field.js'; export * from './relation.js'; -export { getMeta, getEntities } from './definition'; +export { getMeta, getEntities } from './definition.js'; diff --git a/packages/nukak/src/entity/index.ts b/packages/nukak/src/entity/index.ts index b1f4bde5..c0b8b2d8 100644 --- a/packages/nukak/src/entity/index.ts +++ b/packages/nukak/src/entity/index.ts @@ -1 +1 @@ -export * from './decorator'; +export * from './decorator/index.js'; diff --git a/packages/nukak/src/maria/mariadbQuerier.it.ts b/packages/nukak/src/maria/mariadbQuerier.it.ts index c99e0365..196c90ca 100644 --- a/packages/nukak/src/maria/mariadbQuerier.it.ts +++ b/packages/nukak/src/maria/mariadbQuerier.it.ts @@ -1,5 +1,5 @@ -import { AbstractSqlQuerierIt } from 'nukak/querier/abstractSqlQuerier-it'; -import { createSpec } from 'nukak/test'; +import { AbstractSqlQuerierIt } from '../querier/abstractSqlQuerier-it.js'; +import { createSpec } from '../test/index.js'; import { MariadbQuerierPool } from './mariadbQuerierPool.js'; export class MariadbQuerierIt extends AbstractSqlQuerierIt { diff --git a/packages/nukak/src/maria/mariadbQuerier.ts b/packages/nukak/src/maria/mariadbQuerier.ts index 5c31865e..14d4de5c 100644 --- a/packages/nukak/src/maria/mariadbQuerier.ts +++ b/packages/nukak/src/maria/mariadbQuerier.ts @@ -1,8 +1,8 @@ import { PoolConnection } from 'mariadb'; -import { QuerierLogger, QueryUpdateResult } from 'nukak/type/index.js'; -import { AbstractSqlQuerier } from 'nukak/querier'; -import { MySqlDialect } from 'nukak/dialect'; +import { MySqlDialect } from '../dialect/index.js'; +import { AbstractSqlQuerier } from '../querier/index.js'; +import { QuerierLogger, QueryUpdateResult } from '../type/index.js'; export class MariadbQuerier extends AbstractSqlQuerier { constructor(readonly conn: PoolConnection, readonly logger?: QuerierLogger) { diff --git a/packages/nukak/src/maria/mariadbQuerierPool.ts b/packages/nukak/src/maria/mariadbQuerierPool.ts index 598c20f0..04e6ae58 100644 --- a/packages/nukak/src/maria/mariadbQuerierPool.ts +++ b/packages/nukak/src/maria/mariadbQuerierPool.ts @@ -1,5 +1,5 @@ import { createPool, Pool, PoolConfig } from 'mariadb'; -import { QuerierLogger, QuerierPool } from 'nukak/type/index.js'; +import { QuerierLogger, QuerierPool } from '../type/index.js'; import { MariadbQuerier } from './mariadbQuerier.js'; export class MariadbQuerierPool implements QuerierPool { diff --git a/packages/nukak/src/mongo/mongoDialect.spec.ts b/packages/nukak/src/mongo/mongoDialect.spec.ts index 2cfe89b3..d83447c5 100644 --- a/packages/nukak/src/mongo/mongoDialect.spec.ts +++ b/packages/nukak/src/mongo/mongoDialect.spec.ts @@ -1,6 +1,6 @@ import { ObjectId } from 'mongodb'; -import { Item, Spec, TaxCategory, User, createSpec, Tax } from 'nukak/test'; -import { getMeta } from 'nukak/entity'; +import { getMeta } from '../entity/index.js'; +import { Item, Spec, TaxCategory, User, createSpec, Tax } from '../test/index.js'; import { MongoDialect } from './mongoDialect.js'; class MongoDialectSpec implements Spec { diff --git a/packages/nukak/src/mongo/mongoDialect.ts b/packages/nukak/src/mongo/mongoDialect.ts index 9e5d0673..cc283748 100644 --- a/packages/nukak/src/mongo/mongoDialect.ts +++ b/packages/nukak/src/mongo/mongoDialect.ts @@ -1,4 +1,6 @@ import { Filter, ObjectId, Sort } from 'mongodb'; +import { getKeys, hasKeys, buildSortMap, getProjectRelationKeys, getQueryFilterAsMap } from '../util/index.js'; +import { getMeta } from '../entity/decorator/index.js'; import { QueryFilter, Query, @@ -10,9 +12,7 @@ import { QuerySort, FieldValue, RelationKey, -} from 'nukak/type/index.js'; -import { getMeta } from 'nukak/entity/decorator'; -import { getKeys, hasKeys, buildSortMap, getProjectRelationKeys, getQueryFilterAsMap } from 'nukak/util'; +} from '../type/index.js'; export class MongoDialect { filter(entity: Type, filter: QueryFilter = {}, { softDelete }: QueryOptions = {}): Filter { diff --git a/packages/nukak/src/mongo/mongodbQuerier.it.ts b/packages/nukak/src/mongo/mongodbQuerier.it.ts index f7066f97..6ca71098 100644 --- a/packages/nukak/src/mongo/mongodbQuerier.it.ts +++ b/packages/nukak/src/mongo/mongodbQuerier.it.ts @@ -1,6 +1,6 @@ -import { getEntities, getMeta } from 'nukak/entity/decorator'; -import { AbstractQuerierIt } from 'nukak/querier/abstractQuerier-it'; -import { createSpec } from 'nukak/test'; +import { AbstractQuerierIt } from '../querier/abstractQuerier-it.js'; +import { createSpec } from '../test/index.js'; +import { getEntities, getMeta } from '../entity/decorator/index.js'; import { MongodbQuerierPool } from './mongodbQuerierPool.js'; import { MongodbQuerier } from './mongodbQuerier.js'; diff --git a/packages/nukak/src/mongo/mongodbQuerier.ts b/packages/nukak/src/mongo/mongodbQuerier.ts index 030d2c7a..fbb780d8 100644 --- a/packages/nukak/src/mongo/mongodbQuerier.ts +++ b/packages/nukak/src/mongo/mongodbQuerier.ts @@ -1,8 +1,8 @@ import { MongoClient, ClientSession, UpdateFilter, Document } from 'mongodb'; -import { Query, Type, QueryCriteria, QueryOptions, QuerySearch, IdValue, QuerierLogger, QueryUnique } from 'nukak/type/index.js'; -import { AbstractQuerier } from 'nukak/querier'; -import { getMeta } from 'nukak/entity/decorator'; -import { clone, getPersistable, getPersistables, getFieldCallbackValue, hasKeys, isProjectingRelations } from 'nukak/util'; +import { getMeta } from '../entity/decorator/index.js'; +import { AbstractQuerier } from '../querier/index.js'; +import { clone, getPersistable, getPersistables, getFieldCallbackValue, hasKeys, isProjectingRelations } from '../util/index.js'; +import { Query, Type, QueryCriteria, QueryOptions, QuerySearch, IdValue, QuerierLogger, QueryUnique } from '../type/index.js'; import { MongoDialect } from './mongoDialect.js'; diff --git a/packages/nukak/src/mongo/mongodbQuerierPool.ts b/packages/nukak/src/mongo/mongodbQuerierPool.ts index fee00366..4c489659 100644 --- a/packages/nukak/src/mongo/mongodbQuerierPool.ts +++ b/packages/nukak/src/mongo/mongodbQuerierPool.ts @@ -1,5 +1,5 @@ import { MongoClient, MongoClientOptions } from 'mongodb'; -import { QuerierLogger, QuerierPool } from 'nukak/type/index.js'; +import { QuerierLogger, QuerierPool } from '../type/index.js'; import { MongodbQuerier } from './mongodbQuerier.js'; import { MongoDialect } from './mongoDialect.js'; diff --git a/packages/nukak/src/mysql/mysql2Querier.it.ts b/packages/nukak/src/mysql/mysql2Querier.it.ts index 55eb909f..1eea0d57 100644 --- a/packages/nukak/src/mysql/mysql2Querier.it.ts +++ b/packages/nukak/src/mysql/mysql2Querier.it.ts @@ -1,5 +1,5 @@ -import { createSpec } from 'nukak/test'; -import { AbstractSqlQuerierIt } from 'nukak/querier/abstractSqlQuerier-it'; +import { createSpec } from '../test/index.js'; +import { AbstractSqlQuerierIt } from '../querier/abstractSqlQuerier-it.js'; import { MySql2QuerierPool } from './mysql2QuerierPool.js'; export class MySql2QuerierIt extends AbstractSqlQuerierIt { diff --git a/packages/nukak/src/mysql/mysql2Querier.ts b/packages/nukak/src/mysql/mysql2Querier.ts index a43f5f33..5089d1cf 100644 --- a/packages/nukak/src/mysql/mysql2Querier.ts +++ b/packages/nukak/src/mysql/mysql2Querier.ts @@ -1,8 +1,8 @@ import { PoolConnection } from 'mysql2/promise'; -import { QuerierLogger, QueryUpdateResult } from 'nukak/type/index.js'; -import { AbstractSqlQuerier } from 'nukak/querier'; -import { MySqlDialect } from 'nukak/dialect'; +import { QuerierLogger, QueryUpdateResult } from '../type/index.js'; +import { AbstractSqlQuerier } from '../querier/index.js'; +import { MySqlDialect } from '../dialect/index.js'; export class MySql2Querier extends AbstractSqlQuerier { constructor(readonly conn: PoolConnection, readonly logger?: QuerierLogger) { diff --git a/packages/nukak/src/mysql/mysql2QuerierPool.ts b/packages/nukak/src/mysql/mysql2QuerierPool.ts index f52cbad3..e68f1b9b 100644 --- a/packages/nukak/src/mysql/mysql2QuerierPool.ts +++ b/packages/nukak/src/mysql/mysql2QuerierPool.ts @@ -1,5 +1,5 @@ import { createPool, Pool, PoolOptions } from 'mysql2/promise'; -import { QuerierLogger, QuerierPool } from 'nukak/type/index.js'; +import { QuerierLogger, QuerierPool } from '../type/index.js'; import { MySql2Querier } from './mysql2Querier.js'; export class MySql2QuerierPool implements QuerierPool { diff --git a/packages/nukak/src/options.spec.ts b/packages/nukak/src/options.spec.ts index 80caaa09..f0a9aa5d 100644 --- a/packages/nukak/src/options.spec.ts +++ b/packages/nukak/src/options.spec.ts @@ -1,5 +1,5 @@ import { getQuerier, getQuerierPool, setQuerierPool } from './options.js'; -import { User } from './test'; +import { User } from './test/index.js'; import { Querier, Repository } from './type/index.js'; describe('options', () => { diff --git a/packages/nukak/src/postgres/pgQuerier.it.ts b/packages/nukak/src/postgres/pgQuerier.it.ts index c80b28e1..dda2c727 100644 --- a/packages/nukak/src/postgres/pgQuerier.it.ts +++ b/packages/nukak/src/postgres/pgQuerier.it.ts @@ -1,6 +1,6 @@ import { types } from 'pg'; -import { createSpec } from 'nukak/test'; -import { AbstractSqlQuerierIt } from 'nukak/querier/abstractSqlQuerier-it'; +import { createSpec } from '../test/index.js'; +import { AbstractSqlQuerierIt } from '../querier/abstractSqlQuerier-it.js'; import { PgQuerierPool } from './pgQuerierPool.js'; types.setTypeParser(types.builtins.INT8, (value: string) => parseInt(value)); diff --git a/packages/nukak/src/postgres/pgQuerier.ts b/packages/nukak/src/postgres/pgQuerier.ts index 7f4289c1..9b1855ca 100644 --- a/packages/nukak/src/postgres/pgQuerier.ts +++ b/packages/nukak/src/postgres/pgQuerier.ts @@ -1,8 +1,8 @@ import { PoolClient } from 'pg'; -import { QuerierLogger, QueryUpdateResult } from 'nukak/type/index.js'; -import { AbstractSqlQuerier } from 'nukak/querier'; -import { PostgresDialect } from 'nukak/dialect'; +import { QuerierLogger, QueryUpdateResult } from '../type/index.js'; +import { AbstractSqlQuerier } from '../querier/index.js'; +import { PostgresDialect } from '../dialect/index.js'; export class PgQuerier extends AbstractSqlQuerier { constructor(readonly conn: PoolClient, readonly logger?: QuerierLogger) { diff --git a/packages/nukak/src/postgres/pgQuerierPool.ts b/packages/nukak/src/postgres/pgQuerierPool.ts index 38c87b1a..2c7e617a 100644 --- a/packages/nukak/src/postgres/pgQuerierPool.ts +++ b/packages/nukak/src/postgres/pgQuerierPool.ts @@ -1,5 +1,5 @@ import { Pool, PoolConfig } from 'pg'; -import { QuerierLogger, QuerierPool } from 'nukak/type/index.js'; +import { QuerierLogger, QuerierPool } from '../type/index.js'; import { PgQuerier } from './pgQuerier.js'; export class PgQuerierPool implements QuerierPool { diff --git a/packages/nukak/src/querier/abstractQuerier-it.ts b/packages/nukak/src/querier/abstractQuerier-it.ts index 19192ff5..d5d867b8 100644 --- a/packages/nukak/src/querier/abstractQuerier-it.ts +++ b/packages/nukak/src/querier/abstractQuerier-it.ts @@ -1,5 +1,5 @@ -import { getEntities } from '../entity'; -import { Company, InventoryAdjustment, Item, ItemAdjustment, LedgerAccount, MeasureUnit, Spec, Tag, TaxCategory, User } from '../test'; +import { getEntities } from '../entity/index.js'; +import { Company, InventoryAdjustment, Item, ItemAdjustment, LedgerAccount, MeasureUnit, Spec, Tag, TaxCategory, User } from '../test/index.js'; import { Querier, QuerierPool } from '../type/index.js'; export abstract class AbstractQuerierIt implements Spec { diff --git a/packages/nukak/src/querier/abstractQuerier.ts b/packages/nukak/src/querier/abstractQuerier.ts index 2e6fa10b..1dc7593c 100644 --- a/packages/nukak/src/querier/abstractQuerier.ts +++ b/packages/nukak/src/querier/abstractQuerier.ts @@ -13,9 +13,9 @@ import { Repository, Type, } from '../type/index.js'; -import { getMeta } from '../entity'; -import { clone, getKeys, getProjectRelationKeys, getPersistableRelations } from '../util'; -import { GenericRepository } from '../repository'; +import { getMeta } from '../entity/decorator/index.js'; +import { clone, getKeys, getProjectRelationKeys, getPersistableRelations } from '../util/index.js'; +import { GenericRepository } from '../repository/index.js'; export abstract class AbstractQuerier implements Querier { abstract count(entity: Type, qm?: QuerySearch): Promise; diff --git a/packages/nukak/src/querier/abstractSqlQuerier-it.ts b/packages/nukak/src/querier/abstractSqlQuerier-it.ts index fa59bf8c..e380e9ae 100644 --- a/packages/nukak/src/querier/abstractSqlQuerier-it.ts +++ b/packages/nukak/src/querier/abstractSqlQuerier-it.ts @@ -1,4 +1,4 @@ -import { createTables, dropTables } from '../test'; +import { createTables, dropTables } from '../test/index.js'; import { QuerierPool } from '../type/index.js'; import { AbstractQuerierIt } from './abstractQuerier-it.js'; import { AbstractSqlQuerier } from './abstractSqlQuerier.js'; diff --git a/packages/nukak/src/querier/abstractSqlQuerier-spec.ts b/packages/nukak/src/querier/abstractSqlQuerier-spec.ts index 440d34f1..766fd8a1 100644 --- a/packages/nukak/src/querier/abstractSqlQuerier-spec.ts +++ b/packages/nukak/src/querier/abstractSqlQuerier-spec.ts @@ -1,5 +1,5 @@ -import { raw } from '../util'; -import { User, InventoryAdjustment, Spec, Item, Tag, MeasureUnit, dropTables, createTables, clearTables } from '../test'; +import { raw } from '../util/index.js'; +import { User, InventoryAdjustment, Spec, Item, Tag, MeasureUnit, dropTables, createTables, clearTables } from '../test/index.js'; import { QuerierPool } from '../type/index.js'; import { AbstractSqlQuerier } from './abstractSqlQuerier.js'; diff --git a/packages/nukak/src/querier/abstractSqlQuerier.ts b/packages/nukak/src/querier/abstractSqlQuerier.ts index 7dedcd54..54d9c7c8 100644 --- a/packages/nukak/src/querier/abstractSqlQuerier.ts +++ b/packages/nukak/src/querier/abstractSqlQuerier.ts @@ -1,7 +1,7 @@ import { Query, Type, QueryCriteria, QueryOptions, QueryUpdateResult } from '../type/index.js'; -import { unflatObjects, clone } from '../util'; -import { AbstractSqlDialect } from '../dialect'; -import { getMeta } from '../entity'; +import { unflatObjects, clone } from '../util/index.js'; +import { AbstractSqlDialect } from '../dialect/index.js'; +import { getMeta } from '../entity/index.js'; import { AbstractQuerier } from './abstractQuerier.js'; diff --git a/packages/nukak/src/querier/decorator/transactional.spec.ts b/packages/nukak/src/querier/decorator/transactional.spec.ts index 6322e0fb..de6b3daf 100644 --- a/packages/nukak/src/querier/decorator/transactional.spec.ts +++ b/packages/nukak/src/querier/decorator/transactional.spec.ts @@ -1,4 +1,4 @@ -import { getQuerier, setQuerierPool } from '../../options'; +import { getQuerier, setQuerierPool } from '../../options.js'; import { Querier, QuerierPool, Writable } from '../../type/index.js'; import { InjectQuerier } from './injectQuerier.js'; import { Transactional } from './transactional.js'; diff --git a/packages/nukak/src/querier/decorator/transactional.ts b/packages/nukak/src/querier/decorator/transactional.ts index 4c315337..cba2aa12 100644 --- a/packages/nukak/src/querier/decorator/transactional.ts +++ b/packages/nukak/src/querier/decorator/transactional.ts @@ -1,5 +1,5 @@ import { Querier, QuerierPool, Type } from '../../type/index.js'; -import { getQuerierPool } from '../../options'; +import { getQuerierPool } from '../../options.js'; import { getInjectedQuerierIndex } from './injectQuerier.js'; export function Transactional({ diff --git a/packages/nukak/src/querier/index.ts b/packages/nukak/src/querier/index.ts index 7f58e800..29158820 100644 --- a/packages/nukak/src/querier/index.ts +++ b/packages/nukak/src/querier/index.ts @@ -1,3 +1,3 @@ export * from './abstractQuerier.js'; export * from './abstractSqlQuerier.js'; -export * from './decorator'; +export * from './decorator/index.js'; diff --git a/packages/nukak/src/repository/genericRepository.spec.ts b/packages/nukak/src/repository/genericRepository.spec.ts index 9ccaf347..f33c091c 100644 --- a/packages/nukak/src/repository/genericRepository.spec.ts +++ b/packages/nukak/src/repository/genericRepository.spec.ts @@ -1,5 +1,5 @@ import { Querier, Repository } from '../type/index.js'; -import { User } from '../test'; +import { User } from '../test/index.js'; import { GenericRepository } from './genericRepository.js'; describe('repository', () => { diff --git a/packages/nukak/src/test/entityMock.ts b/packages/nukak/src/test/entityMock.ts index 3c8c7d8a..5665ed89 100644 --- a/packages/nukak/src/test/entityMock.ts +++ b/packages/nukak/src/test/entityMock.ts @@ -1,7 +1,7 @@ import { v4 as uuidv4 } from 'uuid'; -import { raw } from '../util'; +import { raw } from '../util/index.js'; import { idKey } from '../type/index.js'; -import { Field, ManyToOne, Id, OneToMany, Entity, OneToOne, ManyToMany } from '../entity'; +import { Field, ManyToOne, Id, OneToMany, Entity, OneToOne, ManyToMany } from '../entity/index.js'; /** * interfaces can (optionally) be used to avoid circular-reference issue between entities. diff --git a/packages/nukak/src/test/it.util.ts b/packages/nukak/src/test/it.util.ts index ad286d0b..23013a6c 100644 --- a/packages/nukak/src/test/it.util.ts +++ b/packages/nukak/src/test/it.util.ts @@ -1,7 +1,7 @@ -import { getKeys } from '../util'; -import { AbstractSqlQuerier } from '../querier'; +import { getKeys } from '../util/index.js'; +import { AbstractSqlQuerier } from '../querier/index.js'; import { Type } from '../type/index.js'; -import { getEntities, getMeta } from '../entity/decorator'; +import { getEntities, getMeta } from '../entity/decorator/index.js'; export async function createTables(querier: AbstractSqlQuerier, primaryKeyType: string) { const entities = getEntities(); diff --git a/packages/nukak/src/util/dialect.util.spec.ts b/packages/nukak/src/util/dialect.util.spec.ts index 940c42d4..8e27151f 100644 --- a/packages/nukak/src/util/dialect.util.spec.ts +++ b/packages/nukak/src/util/dialect.util.spec.ts @@ -1,5 +1,5 @@ -import { getMeta } from '../entity/decorator'; -import { User } from '../test/entityMock'; +import { getMeta } from '../entity/decorator/index.js'; +import { User } from '../test/entityMock.js'; import { augmentFilter } from './dialect.util.js'; import { raw } from './raw.js'; diff --git a/packages/nukak/src/util/dialect.util.ts b/packages/nukak/src/util/dialect.util.ts index 513594f3..4a46d50d 100644 --- a/packages/nukak/src/util/dialect.util.ts +++ b/packages/nukak/src/util/dialect.util.ts @@ -1,4 +1,4 @@ -import { getKeys } from '../util'; +import { getKeys } from '../util/index.js'; import { EntityMeta, FieldKey, diff --git a/packages/nukak/src/util/sql.util.spec.ts b/packages/nukak/src/util/sql.util.spec.ts index 52c7c047..eedaafef 100644 --- a/packages/nukak/src/util/sql.util.spec.ts +++ b/packages/nukak/src/util/sql.util.spec.ts @@ -1,4 +1,4 @@ -import { Item, ItemAdjustment, Storehouse } from '../test'; +import { Item, ItemAdjustment, Storehouse } from '../test/index.js'; import { QuerySortMap } from '../type/index.js'; import { flatObject, unflatObjects } from './sql.util.js'; From a8893f03f7335cfde6be42f0930d3b4daabba9fa Mon Sep 17 00:00:00 2001 From: Roger Date: Fri, 18 Nov 2022 19:57:37 -0500 Subject: [PATCH 06/15] abuild: migrate packaging from commonjs to esm --- jest.config.ts | 16 +--------------- packages/nukak-browser/webpack.config.ts | 3 +-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/jest.config.ts b/jest.config.ts index d5bbb326..76d973d9 100644 --- a/jest.config.ts +++ b/jest.config.ts @@ -1,24 +1,10 @@ import type { JestConfigWithTsJest } from 'ts-jest'; -import tsconfig from './tsconfig.json'; - -const tsConfigPaths = tsconfig.compilerOptions.paths; - -const moduleNameMapper = Object.keys(tsConfigPaths).reduce( - (acc, key) => { - const prop = '^' + key.replace('/*', '/(.*)') + '$'; - acc[prop] = '/' + tsConfigPaths[key][0].replace('/*', '/$1'); - console.log(prop, acc); - return acc; - }, - // sourced from https://kulshekhar.github.io/ts-jest/docs/guides/esm-support/#esm-presets - { '^(\\.{1,2}/.*)\\.js$': '$1' } -); const jestConfig: JestConfigWithTsJest = { verbose: true, extensionsToTreatAsEsm: ['.ts'], - // moduleNameMapper, moduleNameMapper: { + '^(nukak)/(.*)\\.js$': '/packages/$1/src/$2', '^(\\.{1,2}/.*)\\.js$': '$1', }, transform: { diff --git a/packages/nukak-browser/webpack.config.ts b/packages/nukak-browser/webpack.config.ts index 8365684d..4723544b 100644 --- a/packages/nukak-browser/webpack.config.ts +++ b/packages/nukak-browser/webpack.config.ts @@ -1,6 +1,5 @@ -/* eslint-disable @typescript-eslint/no-var-requires */ import { resolve } from 'node:path'; -import { Compiler, Configuration } from 'webpack'; +import { Configuration } from 'webpack'; import ResolveTypeScriptPlugin from 'resolve-typescript-plugin'; import tsconfig from '../../tsconfig.json' assert { type: 'json' }; From 27b2ff9f1bb33b1cd10eeb16c1b240341898b3b5 Mon Sep 17 00:00:00 2001 From: Roger Date: Fri, 18 Nov 2022 19:58:00 -0500 Subject: [PATCH 07/15] v0.0.6 --- lerna.json | 2 +- packages/nukak-browser/package.json | 4 ++-- packages/nukak-express/package.json | 4 ++-- packages/nukak/package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lerna.json b/lerna.json index 00b0ae51..d7bfd454 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.0.5", + "version": "0.0.6", "useWorkspaces": true, "npmClient": "yarn", "npmClientArgs": ["--no-package-lock"], diff --git a/packages/nukak-browser/package.json b/packages/nukak-browser/package.json index fb3b639c..49d0cd73 100644 --- a/packages/nukak-browser/package.json +++ b/packages/nukak-browser/package.json @@ -2,7 +2,7 @@ "name": "nukak-browser", "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", - "version": "0.0.5", + "version": "0.0.6", "type": "module", "main": "./nukak-browser.min.js", "types": "./nukak-browser.min.d.ts", @@ -19,7 +19,7 @@ "@types/webpack": "^5.28.0", "copyfiles": "^2.4.1", "dts-bundle-generator": "^7.0.0", - "nukak": "^0.0.5", + "nukak": "^0.0.6", "rimraf": "^3.0.2", "source-map-loader": "^4.0.1", "ts-loader": "^9.4.1", diff --git a/packages/nukak-express/package.json b/packages/nukak-express/package.json index 3d27ebdc..9f92ffaf 100644 --- a/packages/nukak-express/package.json +++ b/packages/nukak-express/package.json @@ -3,7 +3,7 @@ "homepage": "https://nukak.org", "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", - "version": "0.0.5", + "version": "0.0.6", "type": "module", "main": "./index.js", "types": "./index.d.ts", @@ -22,7 +22,7 @@ "@types/express": "4.17.14", "copyfiles": "^2.4.1", "express": "^4.18.2", - "nukak": "^0.0.5", + "nukak": "^0.0.6", "resolve-typescript-plugin": "^2.0.0", "rimraf": "^3.0.2", "typescript": "^4.9.3" diff --git a/packages/nukak/package.json b/packages/nukak/package.json index 25b332d0..5c204f2d 100644 --- a/packages/nukak/package.json +++ b/packages/nukak/package.json @@ -3,7 +3,7 @@ "homepage": "https://nukak.org", "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", - "version": "0.0.5", + "version": "0.0.6", "type": "module", "main": "./index.js", "types": "./index.d.ts", From bb0b47aa2714388ad8be6428ac7effdc6ed2df0f Mon Sep 17 00:00:00 2001 From: Roger Date: Sun, 20 Nov 2022 06:14:45 -0500 Subject: [PATCH 08/15] tsconfig --- packages/nukak-browser/package.json | 1 - packages/nukak-express/package.json | 2 +- tsconfig.json | 2 +- yarn.lock | 60 ----------------------------- 4 files changed, 2 insertions(+), 63 deletions(-) diff --git a/packages/nukak-browser/package.json b/packages/nukak-browser/package.json index 49d0cd73..ee6dee1c 100644 --- a/packages/nukak-browser/package.json +++ b/packages/nukak-browser/package.json @@ -16,7 +16,6 @@ "clean": "rimraf dist *.tsbuildinfo" }, "devDependencies": { - "@types/webpack": "^5.28.0", "copyfiles": "^2.4.1", "dts-bundle-generator": "^7.0.0", "nukak": "^0.0.6", diff --git a/packages/nukak-express/package.json b/packages/nukak-express/package.json index 9f92ffaf..3840eac9 100644 --- a/packages/nukak-express/package.json +++ b/packages/nukak-express/package.json @@ -16,7 +16,7 @@ }, "peerDependencies": { "express": "^4.18.2", - "nukak": "^0.0.2" + "nukak": "^0.0.6" }, "devDependencies": { "@types/express": "4.17.14", diff --git a/tsconfig.json b/tsconfig.json index 923f9cb6..78bb1a65 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,7 @@ }, "compilerOptions": { "module": "NodeNext", - "moduleResolution": "NodeNext", + "moduleResolution": "Node", "lib": ["ESNext"], "target": "ES2022", "strict": true, diff --git a/yarn.lock b/yarn.lock index 82fa7227..15a2ae45 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2009,15 +2009,6 @@ resolved "https://registry.yarnpkg.com/@types/webidl-conversions/-/webidl-conversions-6.1.1.tgz#e33bc8ea812a01f63f90481c666334844b12a09e" integrity sha512-XAahCdThVuCFDQLT7R7Pk/vqeObFNL3YqRyFZg+AqAP/W1/w3xHaIxuW7WszQqTbIBOPRcItYJIou3i/mppu3Q== -"@types/webpack@^5.28.0": - version "5.28.0" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.0.tgz#78dde06212f038d77e54116cfe69e88ae9ed2c03" - integrity sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w== - dependencies: - "@types/node" "*" - tapable "^2.2.0" - webpack "^5" - "@types/whatwg-url@^8.2.1": version "8.2.2" resolved "https://registry.yarnpkg.com/@types/whatwg-url/-/whatwg-url-8.2.2.tgz#749d5b3873e845897ada99be4448041d4cc39e63" @@ -3417,14 +3408,6 @@ enhanced-resolve@^5.10.0: graceful-fs "^4.2.4" tapable "^2.2.0" -enhanced-resolve@^5.9.2: - version "5.9.2" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz#0224dcd6a43389ebfb2d55efee517e5466772dd9" - integrity sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA== - dependencies: - graceful-fs "^4.2.4" - tapable "^2.2.0" - env-paths@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" @@ -5078,11 +5061,6 @@ jsesc@^2.5.1: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA== -json-parse-better-errors@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== - json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" @@ -7462,14 +7440,6 @@ walker@^1.0.8: dependencies: makeerror "1.0.12" -watchpack@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25" - integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA== - dependencies: - glob-to-regexp "^0.4.1" - graceful-fs "^4.1.2" - watchpack@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" @@ -7529,36 +7499,6 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@^5: - version "5.70.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.70.0.tgz#3461e6287a72b5e6e2f4872700bc8de0d7500e6d" - integrity sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw== - dependencies: - "@types/eslint-scope" "^3.7.3" - "@types/estree" "^0.0.51" - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/wasm-edit" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - acorn "^8.4.1" - acorn-import-assertions "^1.7.6" - browserslist "^4.14.5" - chrome-trace-event "^1.0.2" - enhanced-resolve "^5.9.2" - es-module-lexer "^0.9.0" - eslint-scope "5.1.1" - events "^3.2.0" - glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" - json-parse-better-errors "^1.0.2" - loader-runner "^4.2.0" - mime-types "^2.1.27" - neo-async "^2.6.2" - schema-utils "^3.1.0" - tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" - watchpack "^2.3.1" - webpack-sources "^3.2.3" - webpack@^5.75.0: version "5.75.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152" From 445a42fc6ad194207494d3bbab56ec8762943a96 Mon Sep 17 00:00:00 2001 From: Roger Date: Sun, 20 Nov 2022 06:20:22 -0500 Subject: [PATCH 09/15] tsconfig --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index 78bb1a65..923f9cb6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,7 +5,7 @@ }, "compilerOptions": { "module": "NodeNext", - "moduleResolution": "Node", + "moduleResolution": "NodeNext", "lib": ["ESNext"], "target": "ES2022", "strict": true, From 08b1285053bd3fc3fe6e679152ea6ec852aeba54 Mon Sep 17 00:00:00 2001 From: Roger Date: Sun, 20 Nov 2022 06:20:45 -0500 Subject: [PATCH 10/15] v0.0.7 --- lerna.json | 2 +- packages/nukak-browser/package.json | 4 ++-- packages/nukak-express/package.json | 4 ++-- packages/nukak/package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lerna.json b/lerna.json index d7bfd454..48958238 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.0.6", + "version": "0.0.7", "useWorkspaces": true, "npmClient": "yarn", "npmClientArgs": ["--no-package-lock"], diff --git a/packages/nukak-browser/package.json b/packages/nukak-browser/package.json index ee6dee1c..7b5474c3 100644 --- a/packages/nukak-browser/package.json +++ b/packages/nukak-browser/package.json @@ -2,7 +2,7 @@ "name": "nukak-browser", "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", - "version": "0.0.6", + "version": "0.0.7", "type": "module", "main": "./nukak-browser.min.js", "types": "./nukak-browser.min.d.ts", @@ -18,7 +18,7 @@ "devDependencies": { "copyfiles": "^2.4.1", "dts-bundle-generator": "^7.0.0", - "nukak": "^0.0.6", + "nukak": "^0.0.7", "rimraf": "^3.0.2", "source-map-loader": "^4.0.1", "ts-loader": "^9.4.1", diff --git a/packages/nukak-express/package.json b/packages/nukak-express/package.json index 3840eac9..53ab6273 100644 --- a/packages/nukak-express/package.json +++ b/packages/nukak-express/package.json @@ -3,7 +3,7 @@ "homepage": "https://nukak.org", "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", - "version": "0.0.6", + "version": "0.0.7", "type": "module", "main": "./index.js", "types": "./index.d.ts", @@ -22,7 +22,7 @@ "@types/express": "4.17.14", "copyfiles": "^2.4.1", "express": "^4.18.2", - "nukak": "^0.0.6", + "nukak": "^0.0.7", "resolve-typescript-plugin": "^2.0.0", "rimraf": "^3.0.2", "typescript": "^4.9.3" diff --git a/packages/nukak/package.json b/packages/nukak/package.json index 5c204f2d..0185156a 100644 --- a/packages/nukak/package.json +++ b/packages/nukak/package.json @@ -3,7 +3,7 @@ "homepage": "https://nukak.org", "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", - "version": "0.0.6", + "version": "0.0.7", "type": "module", "main": "./index.js", "types": "./index.d.ts", From 1f782e1c9f4bb599b9c9971a0610549a585d634a Mon Sep 17 00:00:00 2001 From: Roger Date: Wed, 23 Nov 2022 12:47:42 -0500 Subject: [PATCH 11/15] update deps --- package.json | 12 +- packages/nukak-browser/package.json | 2 +- tsconfig.json | 4 +- yarn.lock | 247 +++++++++++++++++----------- 4 files changed, 158 insertions(+), 107 deletions(-) diff --git a/package.json b/package.json index d5dbc986..308c9593 100644 --- a/package.json +++ b/package.json @@ -23,12 +23,12 @@ ] }, "devDependencies": { - "@commitlint/cli": "^17.2.0", - "@commitlint/config-conventional": "^17.2.0", + "@commitlint/cli": "^17.3.0", + "@commitlint/config-conventional": "^17.3.0", "@types/jest": "^29.2.3", - "@typescript-eslint/eslint-plugin": "^5.43.0", - "@typescript-eslint/parser": "^5.43.0", - "concurrently": "^7.5.0", + "@typescript-eslint/eslint-plugin": "^5.44.0", + "@typescript-eslint/parser": "^5.44.0", + "concurrently": "^7.6.0", "coveralls": "^3.1.1", "eslint": "^8.28.0", "eslint-config-prettier": "^8.5.0", @@ -36,7 +36,7 @@ "eslint-plugin-import": "^2.26.0", "eslint-plugin-prettier": "^4.2.1", "jest": "^29.3.1", - "prettier": "^2.7.1", + "prettier": "^2.8.0", "rimraf": "^3.0.2", "run-rs": "^0.7.7", "ts-jest": "^29.0.3", diff --git a/packages/nukak-browser/package.json b/packages/nukak-browser/package.json index 7b5474c3..ec9f3a3a 100644 --- a/packages/nukak-browser/package.json +++ b/packages/nukak-browser/package.json @@ -17,7 +17,7 @@ }, "devDependencies": { "copyfiles": "^2.4.1", - "dts-bundle-generator": "^7.0.0", + "dts-bundle-generator": "^7.1.0", "nukak": "^0.0.7", "rimraf": "^3.0.2", "source-map-loader": "^4.0.1", diff --git a/tsconfig.json b/tsconfig.json index 923f9cb6..adc2bd6c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,10 +4,10 @@ "esm": true }, "compilerOptions": { - "module": "NodeNext", + "module": "ESNext", "moduleResolution": "NodeNext", "lib": ["ESNext"], - "target": "ES2022", + "target": "ESNext", "strict": true, "strictNullChecks": false, "suppressImplicitAnyIndexErrors": true, diff --git a/yarn.lock b/yarn.lock index 15a2ae45..7eca1dba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1153,26 +1153,26 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@commitlint/cli@^17.2.0": - version "17.2.0" - resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.2.0.tgz#75cb39181cea98ccc3c9ec122c367af4252d0b5a" - integrity sha512-kd1zykcrjIKyDRftWW1E1TJqkgzeosEkv1BiYPCdzkb/g/3BrfgwZUHR1vg+HO3qKUb/0dN+jNXArhGGAHpmaQ== +"@commitlint/cli@^17.3.0": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@commitlint/cli/-/cli-17.3.0.tgz#d8497f03e27a5161178e802168d77de2941959a0" + integrity sha512-/H0md7TsKflKzVPz226VfXzVafJFO1f9+r2KcFvmBu08V0T56lZU1s8WL7/xlxqLMqBTVaBf7Ixtc4bskdEEZg== dependencies: "@commitlint/format" "^17.0.0" - "@commitlint/lint" "^17.2.0" - "@commitlint/load" "^17.2.0" + "@commitlint/lint" "^17.3.0" + "@commitlint/load" "^17.3.0" "@commitlint/read" "^17.2.0" "@commitlint/types" "^17.0.0" execa "^5.0.0" - lodash "^4.17.19" + lodash.isfunction "^3.0.9" resolve-from "5.0.0" resolve-global "1.0.0" yargs "^17.0.0" -"@commitlint/config-conventional@^17.2.0": - version "17.2.0" - resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-17.2.0.tgz#245086582cb02901eb4beaa52bc87d138238178f" - integrity sha512-g5hQqRa80f++SYS233dbDSg16YdyounMTAhVcmqtInNeY/GF3aA4st9SVtJxpeGrGmueMrU4L+BBb+6Vs5wrcg== +"@commitlint/config-conventional@^17.3.0": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@commitlint/config-conventional/-/config-conventional-17.3.0.tgz#77bcfabfed932bc80e97f31f2201ba05f504e145" + integrity sha512-hgI+fN5xF8nhS9uG/V06xyT0nlcyvHHMkq0kwRSr96vl5BFlRGaL2C0/YY4kQagfU087tmj01bJkG9Ek98Wllw== dependencies: conventional-changelog-conventionalcommits "^5.0.0" @@ -1184,13 +1184,17 @@ "@commitlint/types" "^17.0.0" ajv "^8.11.0" -"@commitlint/ensure@^17.0.0": - version "17.0.0" - resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-17.0.0.tgz#781ff5f8870cb98ce4496d5c71649a4cd122a0e0" - integrity sha512-M2hkJnNXvEni59S0QPOnqCKIK52G1XyXBGw51mvh7OXDudCmZ9tZiIPpU882p475Mhx48Ien1MbWjCP1zlyC0A== +"@commitlint/ensure@^17.3.0": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@commitlint/ensure/-/ensure-17.3.0.tgz#d7bb60291a254152b468ccb2be8c0dc79667247e" + integrity sha512-kWbrQHDoW5veIUQx30gXoLOCjWvwC6OOEofhPCLl5ytRPBDAQObMbxTha1Bt2aSyNE/IrJ0s0xkdZ1Gi3wJwQg== dependencies: "@commitlint/types" "^17.0.0" - lodash "^4.17.19" + lodash.camelcase "^4.3.0" + lodash.kebabcase "^4.1.1" + lodash.snakecase "^4.1.1" + lodash.startcase "^4.4.0" + lodash.upperfirst "^4.3.1" "@commitlint/execute-rule@^17.0.0": version "17.0.0" @@ -1213,30 +1217,32 @@ "@commitlint/types" "^17.0.0" semver "7.3.7" -"@commitlint/lint@^17.2.0": - version "17.2.0" - resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-17.2.0.tgz#a793579d56c3e73416c750d76f09510bc8a6479f" - integrity sha512-N2oLn4Dj672wKH5qJ4LGO+73UkYXGHO+NTVUusGw83SjEv7GjpqPGKU6KALW2kFQ/GsDefSvOjpSi3CzWHQBDg== +"@commitlint/lint@^17.3.0": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@commitlint/lint/-/lint-17.3.0.tgz#16506deaa347d61bd1195b17df1c6809a553d2a0" + integrity sha512-VilOTPg0i9A7CCWM49E9bl5jytfTvfTxf9iwbWAWNjxJ/A5mhPKbm3sHuAdwJ87tDk1k4j8vomYfH23iaY+1Rw== dependencies: "@commitlint/is-ignored" "^17.2.0" "@commitlint/parse" "^17.2.0" - "@commitlint/rules" "^17.2.0" + "@commitlint/rules" "^17.3.0" "@commitlint/types" "^17.0.0" -"@commitlint/load@^17.2.0": - version "17.2.0" - resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-17.2.0.tgz#11c9fb23a967ff1507a28931c91aae7f978ea4ae" - integrity sha512-HDD57qSqNrk399R4TIjw31AWBG8dBjNj1MrDKZKmC/wvimtnIFlqzcu1+sxfXIOHj/+M6tcMWDtvknGUd7SU+g== +"@commitlint/load@^17.3.0": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@commitlint/load/-/load-17.3.0.tgz#ebfec0198dd1627627e32a2b2ae4744d297599a8" + integrity sha512-u/pV6rCAJrCUN+HylBHLzZ4qj1Ew3+eN9GBPhNi9otGxtOfA8b+8nJSxaNbcC23Ins/kcpjGf9zPSVW7628Umw== dependencies: "@commitlint/config-validator" "^17.1.0" "@commitlint/execute-rule" "^17.0.0" - "@commitlint/resolve-extends" "^17.1.0" + "@commitlint/resolve-extends" "^17.3.0" "@commitlint/types" "^17.0.0" "@types/node" "^14.0.0" chalk "^4.1.0" cosmiconfig "^7.0.0" cosmiconfig-typescript-loader "^4.0.0" - lodash "^4.17.19" + lodash.isplainobject "^4.0.6" + lodash.merge "^4.6.2" + lodash.uniq "^4.5.0" resolve-from "^5.0.0" ts-node "^10.8.1" typescript "^4.6.4" @@ -1266,24 +1272,24 @@ git-raw-commits "^2.0.0" minimist "^1.2.6" -"@commitlint/resolve-extends@^17.1.0": - version "17.1.0" - resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-17.1.0.tgz#7cf04fa13096c8a6544a4af13321fdf8d0d50694" - integrity sha512-jqKm00LJ59T0O8O4bH4oMa4XyJVEOK4GzH8Qye9XKji+Q1FxhZznxMV/bDLyYkzbTodBt9sL0WLql8wMtRTbqQ== +"@commitlint/resolve-extends@^17.3.0": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@commitlint/resolve-extends/-/resolve-extends-17.3.0.tgz#413a9ec393266d0673e6b9ec2f0974c358ed662d" + integrity sha512-Lf3JufJlc5yVEtJWC8o4IAZaB8FQAUaVlhlAHRACd0TTFizV2Lk2VH70et23KgvbQNf7kQzHs/2B4QZalBv6Cg== dependencies: "@commitlint/config-validator" "^17.1.0" "@commitlint/types" "^17.0.0" import-fresh "^3.0.0" - lodash "^4.17.19" + lodash.mergewith "^4.6.2" resolve-from "^5.0.0" resolve-global "^1.0.0" -"@commitlint/rules@^17.2.0": - version "17.2.0" - resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-17.2.0.tgz#b49d5ee3b5f599d7c21aab453bb055ecdc6c2e7c" - integrity sha512-1YynwD4Eh7HXZNpqG8mtUlL2pSX2jBy61EejYJv4ooZPcg50Ak7LPOyD3a9UZnsE76AXWFBz+yo9Hv4MIpAa0Q== +"@commitlint/rules@^17.3.0": + version "17.3.0" + resolved "https://registry.yarnpkg.com/@commitlint/rules/-/rules-17.3.0.tgz#4b31d6739f7eb8c7222b323b0bc2b63bd298a4ad" + integrity sha512-s2UhDjC5yP2utx3WWqsnZRzjgzAX8BMwr1nltC0u0p8T/nzpkx4TojEfhlsOUj1t7efxzZRjUAV0NxNwdJyk+g== dependencies: - "@commitlint/ensure" "^17.0.0" + "@commitlint/ensure" "^17.3.0" "@commitlint/message" "^17.2.0" "@commitlint/to-lines" "^17.0.0" "@commitlint/types" "^17.0.0" @@ -2029,14 +2035,14 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^5.43.0": - version "5.43.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.43.0.tgz#4a5248eb31b454715ddfbf8cfbf497529a0a78bc" - integrity sha512-wNPzG+eDR6+hhW4yobEmpR36jrqqQv1vxBq5LJO3fBAktjkvekfr4BRl+3Fn1CM/A+s8/EiGUbOMDoYqWdbtXA== +"@typescript-eslint/eslint-plugin@^5.44.0": + version "5.44.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.44.0.tgz#105788f299050c917eb85c4d9fd04b089e3740de" + integrity sha512-j5ULd7FmmekcyWeArx+i8x7sdRHzAtXTkmDPthE4amxZOWKFK7bomoJ4r7PJ8K7PoMzD16U8MmuZFAonr1ERvw== dependencies: - "@typescript-eslint/scope-manager" "5.43.0" - "@typescript-eslint/type-utils" "5.43.0" - "@typescript-eslint/utils" "5.43.0" + "@typescript-eslint/scope-manager" "5.44.0" + "@typescript-eslint/type-utils" "5.44.0" + "@typescript-eslint/utils" "5.44.0" debug "^4.3.4" ignore "^5.2.0" natural-compare-lite "^1.4.0" @@ -2044,72 +2050,72 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.43.0": - version "5.43.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.43.0.tgz#9c86581234b88f2ba406f0b99a274a91c11630fd" - integrity sha512-2iHUK2Lh7PwNUlhFxxLI2haSDNyXvebBO9izhjhMoDC+S3XI9qt2DGFUsiJ89m2k7gGYch2aEpYqV5F/+nwZug== +"@typescript-eslint/parser@^5.44.0": + version "5.44.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.44.0.tgz#99e2c710a2252191e7a79113264f438338b846ad" + integrity sha512-H7LCqbZnKqkkgQHaKLGC6KUjt3pjJDx8ETDqmwncyb6PuoigYajyAwBGz08VU/l86dZWZgI4zm5k2VaKqayYyA== dependencies: - "@typescript-eslint/scope-manager" "5.43.0" - "@typescript-eslint/types" "5.43.0" - "@typescript-eslint/typescript-estree" "5.43.0" + "@typescript-eslint/scope-manager" "5.44.0" + "@typescript-eslint/types" "5.44.0" + "@typescript-eslint/typescript-estree" "5.44.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.43.0": - version "5.43.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.43.0.tgz#566e46303392014d5d163704724872e1f2dd3c15" - integrity sha512-XNWnGaqAtTJsUiZaoiGIrdJYHsUOd3BZ3Qj5zKp9w6km6HsrjPk/TGZv0qMTWyWj0+1QOqpHQ2gZOLXaGA9Ekw== +"@typescript-eslint/scope-manager@5.44.0": + version "5.44.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.44.0.tgz#988c3f34b45b3474eb9ff0674c18309dedfc3e04" + integrity sha512-2pKml57KusI0LAhgLKae9kwWeITZ7IsZs77YxyNyIVOwQ1kToyXRaJLl+uDEXzMN5hnobKUOo2gKntK9H1YL8g== dependencies: - "@typescript-eslint/types" "5.43.0" - "@typescript-eslint/visitor-keys" "5.43.0" + "@typescript-eslint/types" "5.44.0" + "@typescript-eslint/visitor-keys" "5.44.0" -"@typescript-eslint/type-utils@5.43.0": - version "5.43.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.43.0.tgz#91110fb827df5161209ecca06f70d19a96030be6" - integrity sha512-K21f+KY2/VvYggLf5Pk4tgBOPs2otTaIHy2zjclo7UZGLyFH86VfUOm5iq+OtDtxq/Zwu2I3ujDBykVW4Xtmtg== +"@typescript-eslint/type-utils@5.44.0": + version "5.44.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.44.0.tgz#bc5a6e8a0269850714a870c9268c038150dfb3c7" + integrity sha512-A1u0Yo5wZxkXPQ7/noGkRhV4J9opcymcr31XQtOzcc5nO/IHN2E2TPMECKWYpM3e6olWEM63fq/BaL1wEYnt/w== dependencies: - "@typescript-eslint/typescript-estree" "5.43.0" - "@typescript-eslint/utils" "5.43.0" + "@typescript-eslint/typescript-estree" "5.44.0" + "@typescript-eslint/utils" "5.44.0" debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.43.0": - version "5.43.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.43.0.tgz#e4ddd7846fcbc074325293515fa98e844d8d2578" - integrity sha512-jpsbcD0x6AUvV7tyOlyvon0aUsQpF8W+7TpJntfCUWU1qaIKu2K34pMwQKSzQH8ORgUrGYY6pVIh1Pi8TNeteg== +"@typescript-eslint/types@5.44.0": + version "5.44.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.44.0.tgz#f3f0b89aaff78f097a2927fe5688c07e786a0241" + integrity sha512-Tp+zDnHmGk4qKR1l+Y1rBvpjpm5tGXX339eAlRBDg+kgZkz9Bw+pqi4dyseOZMsGuSH69fYfPJCBKBrbPCxYFQ== -"@typescript-eslint/typescript-estree@5.43.0": - version "5.43.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.43.0.tgz#b6883e58ba236a602c334be116bfc00b58b3b9f2" - integrity sha512-BZ1WVe+QQ+igWal2tDbNg1j2HWUkAa+CVqdU79L4HP9izQY6CNhXfkNwd1SS4+sSZAP/EthI1uiCSY/+H0pROg== +"@typescript-eslint/typescript-estree@5.44.0": + version "5.44.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.44.0.tgz#0461b386203e8d383bb1268b1ed1da9bc905b045" + integrity sha512-M6Jr+RM7M5zeRj2maSfsZK2660HKAJawv4Ud0xT+yauyvgrsHu276VtXlKDFnEmhG+nVEd0fYZNXGoAgxwDWJw== dependencies: - "@typescript-eslint/types" "5.43.0" - "@typescript-eslint/visitor-keys" "5.43.0" + "@typescript-eslint/types" "5.44.0" + "@typescript-eslint/visitor-keys" "5.44.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/utils@5.43.0": - version "5.43.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.43.0.tgz#00fdeea07811dbdf68774a6f6eacfee17fcc669f" - integrity sha512-8nVpA6yX0sCjf7v/NDfeaOlyaIIqL7OaIGOWSPFqUKK59Gnumd3Wa+2l8oAaYO2lk0sO+SbWFWRSvhu8gLGv4A== +"@typescript-eslint/utils@5.44.0": + version "5.44.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.44.0.tgz#d733da4d79d6c30f1a68b531cdda1e0c1f00d52d" + integrity sha512-fMzA8LLQ189gaBjS0MZszw5HBdZgVwxVFShCO3QN+ws3GlPkcy9YuS3U4wkT6su0w+Byjq3mS3uamy9HE4Yfjw== dependencies: "@types/json-schema" "^7.0.9" "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.43.0" - "@typescript-eslint/types" "5.43.0" - "@typescript-eslint/typescript-estree" "5.43.0" + "@typescript-eslint/scope-manager" "5.44.0" + "@typescript-eslint/types" "5.44.0" + "@typescript-eslint/typescript-estree" "5.44.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" semver "^7.3.7" -"@typescript-eslint/visitor-keys@5.43.0": - version "5.43.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.43.0.tgz#cbbdadfdfea385310a20a962afda728ea106befa" - integrity sha512-icl1jNH/d18OVHLfcwdL3bWUKsBeIiKYTGxMJCoGe7xFht+E4QgzOqoWYrU8XSLJWhVw8nTacbm03v23J/hFTg== +"@typescript-eslint/visitor-keys@5.44.0": + version "5.44.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.44.0.tgz#10740dc28902bb903d12ee3a005cc3a70207d433" + integrity sha512-a48tLG8/4m62gPFbJ27FxwCOqPKxsb8KC3HkmYoq2As/4YyjQl1jDbRr1s63+g4FS/iIehjmN3L5UjmKva1HzQ== dependencies: - "@typescript-eslint/types" "5.43.0" + "@typescript-eslint/types" "5.44.0" eslint-visitor-keys "^3.3.0" "@webassemblyjs/ast@1.11.1": @@ -2995,10 +3001,10 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= -concurrently@^7.5.0: - version "7.5.0" - resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.5.0.tgz#4dd432d4634a8251f27ab000c4974e78e3906bd3" - integrity sha512-5E3mwiS+i2JYBzr5BpXkFxOnleZTMsG+WnE/dCG4/P+oiVXrbmrBwJ2ozn4SxwB2EZDrKR568X+puVohxz3/Mg== +concurrently@^7.6.0: + version "7.6.0" + resolved "https://registry.yarnpkg.com/concurrently/-/concurrently-7.6.0.tgz#531a6f5f30cf616f355a4afb8f8fcb2bba65a49a" + integrity sha512-BKtRgvcJGeZ4XttiDiNcFiRlxoAeZOseqUvyYRUp/Vtd+9p1ULmeoSqGsDA+2ivdeDFpqrJvGvmI+StKfKl5hw== dependencies: chalk "^4.1.0" date-fns "^2.29.1" @@ -3332,10 +3338,10 @@ dot-prop@^5.1.0: dependencies: is-obj "^2.0.0" -dts-bundle-generator@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/dts-bundle-generator/-/dts-bundle-generator-7.0.0.tgz#9f8264f5ae17c7fef656dd535828326db32c87be" - integrity sha512-3mhkUvUsxYT5aK4NOJH9iCOMy04vLEeH2gemBD+rSAYn5x7OiLbzyAEzf6gix3jyx/0I9qjYJOja1pvnqBhKDQ== +dts-bundle-generator@^7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/dts-bundle-generator/-/dts-bundle-generator-7.1.0.tgz#c8ea803c62654dbfc6618da9226f022c54d93de2" + integrity sha512-RDm/HY6722PVWG3m+ZwLvD1TF9hNbDHoKeYwx1WmDo2So1eh4eRH2HTqxAmBiK0uQj7IogtxO6fyezQw3E793Q== dependencies: typescript ">=4.5.2" yargs "^17.6.0" @@ -5203,6 +5209,26 @@ locate-path@^6.0.0: dependencies: p-locate "^5.0.0" +lodash.camelcase@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" + integrity sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA== + +lodash.isfunction@^3.0.9: + version "3.0.9" + resolved "https://registry.yarnpkg.com/lodash.isfunction/-/lodash.isfunction-3.0.9.tgz#06de25df4db327ac931981d1bdb067e5af68d051" + integrity sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw== + +lodash.isplainobject@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz#7c526a52d89b45c45cc690b88163be0497f550cb" + integrity sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA== + +lodash.kebabcase@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz#8489b1cb0d29ff88195cceca448ff6d6cc295c36" + integrity sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g== + lodash.memoize@4.x: version "4.1.2" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" @@ -5213,7 +5239,32 @@ lodash.merge@^4.6.2: resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21: +lodash.mergewith@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55" + integrity sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ== + +lodash.snakecase@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz#39d714a35357147837aefd64b5dcbb16becd8f8d" + integrity sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw== + +lodash.startcase@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.startcase/-/lodash.startcase-4.4.0.tgz#9436e34ed26093ed7ffae1936144350915d9add8" + integrity sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg== + +lodash.uniq@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" + integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ== + +lodash.upperfirst@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz#1365edf431480481ef0d1c68957a5ed99d49f7ce" + integrity sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg== + +lodash@^4.17.15, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -6149,10 +6200,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.7.1: - version "2.7.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.7.1.tgz#e235806850d057f97bb08368a4f7d899f7760c64" - integrity sha512-ujppO+MkdPqoVINuDFDRLClm7D78qbDt0/NR+wp5FqEZOoTNAjPHWj17QRhu7geIHJfcNhRk1XVQmF8Bp3ye+g== +prettier@^2.8.0: + version "2.8.0" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.8.0.tgz#c7df58393c9ba77d6fba3921ae01faf994fb9dc9" + integrity sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA== pretty-format@^29.0.0, pretty-format@^29.3.1: version "29.3.1" From 8dac554a7540d89d5a969c92be44f6bb5ce164d9 Mon Sep 17 00:00:00 2001 From: Roger Date: Wed, 23 Nov 2022 13:44:46 -0500 Subject: [PATCH 12/15] fix: esm issue --- packages/nukak/src/dialect/abstractSqlDialect.ts | 4 ++-- packages/nukak/src/postgres/pgQuerierPool.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/nukak/src/dialect/abstractSqlDialect.ts b/packages/nukak/src/dialect/abstractSqlDialect.ts index d115de5e..8a5a38cd 100644 --- a/packages/nukak/src/dialect/abstractSqlDialect.ts +++ b/packages/nukak/src/dialect/abstractSqlDialect.ts @@ -1,4 +1,4 @@ -import { escape } from 'sqlstring'; +import sqlstring from 'sqlstring'; import { QueryFilter, Query, @@ -460,6 +460,6 @@ export abstract class AbstractSqlDialect implements QueryDialect { if (value instanceof QueryRaw) { return getRawValue({ value, dialect: this }); } - return escape(value); + return sqlstring.escape(value); } } diff --git a/packages/nukak/src/postgres/pgQuerierPool.ts b/packages/nukak/src/postgres/pgQuerierPool.ts index 2c7e617a..26fc910f 100644 --- a/packages/nukak/src/postgres/pgQuerierPool.ts +++ b/packages/nukak/src/postgres/pgQuerierPool.ts @@ -1,12 +1,12 @@ -import { Pool, PoolConfig } from 'pg'; +import pg from 'pg'; import { QuerierLogger, QuerierPool } from '../type/index.js'; import { PgQuerier } from './pgQuerier.js'; export class PgQuerierPool implements QuerierPool { - readonly pool: Pool; + readonly pool: pg.Pool; - constructor(opts: PoolConfig, readonly logger?: QuerierLogger) { - this.pool = new Pool(opts); + constructor(opts: pg.PoolConfig, readonly logger?: QuerierLogger) { + this.pool = new pg.Pool(opts); } async getQuerier() { From 46db12e9865bb0a1234d381ef2bcc7fff479f5bd Mon Sep 17 00:00:00 2001 From: Roger Date: Wed, 23 Nov 2022 13:45:10 -0500 Subject: [PATCH 13/15] v0.0.8 --- lerna.json | 2 +- packages/nukak-browser/package.json | 4 ++-- packages/nukak-express/package.json | 4 ++-- packages/nukak/package.json | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lerna.json b/lerna.json index 48958238..493f84af 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "0.0.7", + "version": "0.0.8", "useWorkspaces": true, "npmClient": "yarn", "npmClientArgs": ["--no-package-lock"], diff --git a/packages/nukak-browser/package.json b/packages/nukak-browser/package.json index ec9f3a3a..0a82c7a0 100644 --- a/packages/nukak-browser/package.json +++ b/packages/nukak-browser/package.json @@ -2,7 +2,7 @@ "name": "nukak-browser", "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", - "version": "0.0.7", + "version": "0.0.8", "type": "module", "main": "./nukak-browser.min.js", "types": "./nukak-browser.min.d.ts", @@ -18,7 +18,7 @@ "devDependencies": { "copyfiles": "^2.4.1", "dts-bundle-generator": "^7.1.0", - "nukak": "^0.0.7", + "nukak": "^0.0.8", "rimraf": "^3.0.2", "source-map-loader": "^4.0.1", "ts-loader": "^9.4.1", diff --git a/packages/nukak-express/package.json b/packages/nukak-express/package.json index 53ab6273..5fe1fd42 100644 --- a/packages/nukak-express/package.json +++ b/packages/nukak-express/package.json @@ -3,7 +3,7 @@ "homepage": "https://nukak.org", "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", - "version": "0.0.7", + "version": "0.0.8", "type": "module", "main": "./index.js", "types": "./index.d.ts", @@ -22,7 +22,7 @@ "@types/express": "4.17.14", "copyfiles": "^2.4.1", "express": "^4.18.2", - "nukak": "^0.0.7", + "nukak": "^0.0.8", "resolve-typescript-plugin": "^2.0.0", "rimraf": "^3.0.2", "typescript": "^4.9.3" diff --git a/packages/nukak/package.json b/packages/nukak/package.json index 0185156a..4595d43d 100644 --- a/packages/nukak/package.json +++ b/packages/nukak/package.json @@ -3,7 +3,7 @@ "homepage": "https://nukak.org", "description": "flexible and efficient ORM, with declarative JSON syntax and smart type-safety", "license": "MIT", - "version": "0.0.7", + "version": "0.0.8", "type": "module", "main": "./index.js", "types": "./index.d.ts", From b81f47cb98a0d8b83553a919f07d9a07d38bb799 Mon Sep 17 00:00:00 2001 From: Roger Date: Wed, 23 Nov 2022 14:32:02 -0500 Subject: [PATCH 14/15] update deps --- packages/nukak/package.json | 4 ++-- yarn.lock | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/nukak/package.json b/packages/nukak/package.json index 4595d43d..59b92031 100644 --- a/packages/nukak/package.json +++ b/packages/nukak/package.json @@ -29,7 +29,7 @@ "@types/uuid": "^8.3.4", "copyfiles": "^2.4.1", "mariadb": "^3.0.2", - "mongodb": "^4.12.0", + "mongodb": "^4.12.1", "mysql2": "^2.3.3", "pg": "^8.8.0", "rimraf": "^3.0.2", @@ -39,7 +39,7 @@ }, "peerDependencies": { "mariadb": "^3.0.2", - "mongodb": "^4.12.0", + "mongodb": "^4.12.1", "mysql2": "^2.3.3", "pg": "^8.8.0", "sqlite3": "^5.1.2" diff --git a/yarn.lock b/yarn.lock index 7eca1dba..bf9b507e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5639,10 +5639,10 @@ mongodb@3.6.x: optionalDependencies: saslprep "^1.0.0" -mongodb@^4.12.0: - version "4.12.0" - resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.12.0.tgz#cbf14d4bc7f9d320d16e5971f76d8b8a36af7752" - integrity sha512-ssWod7DqVE4faluZESdOqYhV1BI5CQA5c31sr+zxDLJDBX9EA5VJLo8RNSItPTwxExmuGn/T6MbETQWjywNehA== +mongodb@^4.12.1: + version "4.12.1" + resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-4.12.1.tgz#224eb39b8784af835b515aa687c6010cecaabb1a" + integrity sha512-koT87tecZmxPKtxRQD8hCKfn+ockEL2xBiUvx3isQGI6mFmagWt4f4AyCE9J4sKepnLhMacoCTQQA6SLAI2L6w== dependencies: bson "^4.7.0" mongodb-connection-string-url "^2.5.4" From 1041948aef09b9d1d2e2da84e796c6b272179a84 Mon Sep 17 00:00:00 2001 From: Roger Date: Wed, 23 Nov 2022 14:46:59 -0500 Subject: [PATCH 15/15] update webpack config --- packages/nukak-browser/webpack.config.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/nukak-browser/webpack.config.ts b/packages/nukak-browser/webpack.config.ts index 4723544b..85339d0b 100644 --- a/packages/nukak-browser/webpack.config.ts +++ b/packages/nukak-browser/webpack.config.ts @@ -19,13 +19,13 @@ const config: Configuration = { devtool: isProductionMode ? 'source-map' : 'cheap-module-source-map', resolve: { - extensions: ['.ts', '.js'], + extensions: ['.js'], alias: buildAlias(), plugins: [new ResolveTypeScriptPlugin()], }, entry: { - [entryName]: ['./src/index.ts'], + [entryName]: ['./src/index.js'], }, output: { @@ -54,12 +54,14 @@ const config: Configuration = { }; function buildAlias() { - return Object.keys(tsPathAliases).reduce((acc, key) => { + const alias = Object.keys(tsPathAliases).reduce((acc, key) => { const prop = key.replace('/*', ''); const val = tsPathAliases[key][0].replace('/*', ''); acc[prop] = resolve(parentDir, val); return acc; }, {}); + console.log('ts alias', alias); + return alias; } export default config;