@opra/common 1.0.0-alpha.32 → 1.0.0-alpha.34

package/cjs/document/decorators/http-controller.decorator.js

@@ -6,7 +6,7 @@ const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const putil_merge_1 = tslib_1.__importDefault(require("putil-merge"));
 const index_js_1 = require("../../schema/index.js");
 const constants_js_1 = require("../constants.js");
-const CLASS_NAME_PATTERN = /^(.*)(Collection|Singleton|Resource|Controller)$/;
+const CLASS_NAME_PATTERN = /^(.*)(Controller)$/;
 function HttpControllerDecoratorFactory(options) {
     const decoratorChain = [];
     /**

package/esm/document/decorators/http-controller.decorator.js

@@ -2,7 +2,7 @@ import omit from 'lodash.omit';
 import merge from 'putil-merge';
 import { OpraSchema } from '../../schema/index.js';
 import { HTTP_CONTROLLER_METADATA } from '../constants.js';
-const CLASS_NAME_PATTERN = /^(.*)(Collection|Singleton|Resource|Controller)$/;
+const CLASS_NAME_PATTERN = /^(.*)(Controller)$/;
 export function HttpControllerDecoratorFactory(options) {
     const decoratorChain = [];
     /**

package/esm/package.json

@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}

package/package.json

@@ -1,47 +1,16 @@
 {
   "name": "@opra/common",
-  "version": "1.0.0-alpha.32",
+  "version": "1.0.0-alpha.34",
   "description": "Opra common package",
   "author": "Panates",
   "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/panates/opra.git",
-    "directory": "packages/common"
-  },
-  "type": "module",
-  "module": "./esm/index.js",
-  "main": "./cjs/index.js",
-  "browser": "./browser.js",
-  "types": "./types/index.d.ts",
-  "scripts": {
-    "compile": "tsc",
-    "prebuild": "npm run check && npm run lint && npm run clean",
-    "build": "npm run build:cjs && npm run build:esm && npm run build:browser",
-    "build:cjs": "tsc -b tsconfig-build-cjs.json",
-    "build:esm": "tsc -b tsconfig-build-esm.json",
-    "build:browser": "node esbuild.mjs",
-    "postbuild": "cp package.json ../../LICENSE ../../build/common && cp ../../package.cjs.json ../../build/common/cjs/package.json",
-    "lint": "eslint . --max-warnings=0",
-    "lint:fix": "eslint . --max-warnings=0 --fix",
-    "format": "prettier . --write --log-level=warn",
-    "check": "madge --circular src/**",
-    "test": "jest --passWithNoTests",
-    "cover": "jest --passWithNoTests --collect-coverage",
-    "clean": "npm run clean:src && npm run clean:test && npm run clean:dist && npm run clean:cover",
-    "clean:src": "ts-cleanup -s src --all",
-    "clean:test": "ts-cleanup -s test --all",
-    "clean:dist": "rimraf ../../build/client",
-    "clean:cover": "rimraf ../../coverage/client",
-    "antlr4": "java -jar ./tools/antlr4-4.12.1-SNAPSHOT-complete.jar -Dlanguage=TypeScript ./src/filter/antlr/OpraFilter.g4 -visitor"
-  },
   "dependencies": {
-    "@browsery/antlr4": "^4.13.1-patch-1",
-    "@browsery/highland": "^2.13.5",
-    "@browsery/http-parser": "^0.5.8",
-    "@browsery/i18next": "^23.11.5",
-    "@browsery/type-is": "^1.6.18-r3",
-    "fast-tokenizer": "^1.3.0",
+    "@browsery/antlr4": "^4.13.3-r1",
+    "@browsery/highland": "^2.13.6-r2",
+    "@browsery/http-parser": "^0.5.9-r1",
+    "@browsery/i18next": "^23.12.3-r1",
+    "@browsery/type-is": "^1.6.18-r5",
+    "fast-tokenizer": "^1.6.1",
     "lodash.omit": "^4.5.0",
     "putil-isplainobject": "^1.1.5",
     "putil-merge": "^3.13.0",
@@ -51,34 +20,52 @@
     "super-fast-md5": "^1.0.3",
     "tslib": "^2.6.3",
     "uid": "^2.0.1",
-    "valgen": "^5.6.0"
+    "valgen": "^5.8.2"
   },
-  "devDependencies": {
-    "@browsery/fs": "^0.4.0",
-    "@browsery/stream": "^4.3.0",
-    "@browsery/util": "^0.12.5",
-    "@types/encodeurl": "^1.0.2",
-    "@types/lodash.omit": "^4.5.9",
-    "@types/validator": "^13.12.0",
-    "path-browserify": "^1.0.1",
-    "ts-gems": "^3.4.0"
+  "type": "module",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "require": {
+        "types": "./types/index.d.ts",
+        "default": "./cjs/index.js"
+      },
+      "browser": {
+        "types": "./types/index.d.ts",
+        "import": "./browser/index.mjs",
+        "require": "./browser/index.cjs",
+        "default": "./browser/index.mjs"
+      },
+      "default": "./esm/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "browser": "./browser/index.cjs",
+  "types": "./types/index.d.ts",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/panates/opra.git",
+    "directory": "packages/common"
   },
   "engines": {
     "node": ">=16.0",
     "npm": ">=7.0.0"
   },
   "files": [
-    "bin/",
     "cjs/",
     "esm/",
-    "umd/",
+    "browser/",
     "types/",
     "LICENSE",
-    "README.md",
-    "browser.js"
+    "README.md"
   ],
   "keywords": [
     "opra",
     "common"
   ]
-}
+}

package/types/document/common/api-base.d.ts

@@ -1,5 +1,5 @@
 import { OpraSchema } from '../../schema/index.js';
-import type { ApiDocument } from '../api-document';
+import type { ApiDocument } from '../api-document.js';
 import { DocumentElement } from './document-element.js';
 import type { DocumentInitContext } from './document-init-context';
 export declare namespace ApiBase {

package/types/document/common/document-node.d.ts

@@ -1,14 +1,14 @@
 import { Type } from 'ts-gems';
 import type { ApiDocument } from '../api-document.js';
 import { kDataTypeMap } from '../constants.js';
-import type { ComplexType } from '../data-type/complex-type';
-import type { DataType } from '../data-type/data-type';
-import type { EnumType } from '../data-type/enum-type';
-import type { MappedType } from '../data-type/mapped-type';
-import type { MixinType } from '../data-type/mixin-type';
-import type { SimpleType } from '../data-type/simple-type';
+import type { ComplexType } from '../data-type/complex-type.js';
+import type { DataType } from '../data-type/data-type.js';
+import type { EnumType } from '../data-type/enum-type.js';
+import type { MappedType } from '../data-type/mapped-type.js';
+import type { MixinType } from '../data-type/mixin-type.js';
+import type { SimpleType } from '../data-type/simple-type.js';
 import type { DataTypeMap } from './data-type-map.js';
-import type { DocumentElement } from './document-element';
+import type { DocumentElement } from './document-element.js';
 /**
  * @class DocumentNode
  */

package/types/document/data-type/complex-type-base.d.ts

@@ -4,8 +4,8 @@ import { FieldsProjection, ResponsiveMap } from '../../helpers/index.js';
 import { OpraSchema } from '../../schema/index.js';
 import type { DocumentElement } from '../common/document-element.js';
 import { DocumentInitContext } from '../common/document-init-context.js';
-import type { ApiField } from './api-field';
-import type { ComplexType } from './complex-type';
+import type { ApiField } from './api-field.js';
+import type { ComplexType } from './complex-type.js';
 import { DataType } from './data-type.js';
 import Field = OpraSchema.Field;
 export declare const FIELD_PATH_PATTERN: RegExp;

package/types/document/data-type/mapped-type.d.ts

@@ -6,7 +6,7 @@ import { DocumentElement } from '../common/document-element.js';
 import type { ComplexType } from './complex-type.js';
 import { ComplexTypeBase } from './complex-type-base.js';
 import { DataType } from './data-type.js';
-import type { MixinType } from './mixin-type';
+import type { MixinType } from './mixin-type.js';
 /**
  * @namespace MappedType
  */

package/types/document/data-type/utils/create-mapped-class.d.ts

@@ -1,3 +1,3 @@
 import { Type } from 'ts-gems';
-import type { DataType } from '../data-type';
+import type { DataType } from '../data-type.js';
 export declare function createMappedClass(source: string | Type, config: any, options?: DataType.Options): any;

package/types/document/decorators/api-field-decorator.d.ts

@@ -1,4 +1,4 @@
-import type { ApiField } from '../data-type/api-field';
+import type { ApiField } from '../data-type/api-field.js';
 export interface ApiFieldDecorator {
     (options?: ApiField.Options): PropertyDecorator;
 }

package/types/document/decorators/http-controller.decorator.d.ts

@@ -1,6 +1,6 @@
 import { StrictOmit, Type, TypeThunkAsync } from 'ts-gems';
-import type { HttpController } from '../http/http-controller';
-import type { HttpParameter } from '../http/http-parameter';
+import type { HttpController } from '../http/http-controller.js';
+import type { HttpParameter } from '../http/http-parameter.js';
 export interface HttpControllerDecorator<T extends HttpControllerDecorator<any> = HttpControllerDecorator<any>> extends ClassDecorator {
     Cookie(name: string | RegExp, optionsOrType?: StrictOmit<HttpParameter.Options, 'location'> | string | Type | false): T;
     Header(name: string | RegExp, optionsOrType?: StrictOmit<HttpParameter.Options, 'location'> | string | TypeThunkAsync | false): T;

package/types/document/decorators/http-operation-entity.decorator.d.ts

@@ -5,7 +5,7 @@ import type { HttpParameter } from '../http/http-parameter.js';
 import { HttpRequestBody } from '../http/http-request-body.js';
 import { HttpOperationDecorator } from './http-operation.decorator.js';
 /** Augmentation **/
-declare module '../http/http-operation' {
+declare module '../http/http-operation.js' {
     /**
      * HttpOperationConstructor
      */

package/types/filter/errors.d.ts

@@ -1,5 +1,4 @@
-import { RecognitionException } from '@browsery/antlr4';
-import { Recognizer } from '@browsery/antlr4/typings/Recognizer';
+import { Recognizer } from '@browsery/antlr4';
 export declare class SyntaxError extends TypeError {
 }
 export declare class FilterValidationError extends TypeError {
@@ -12,12 +11,12 @@ export declare class FilterParseError extends Error {
     offendingSymbol?: any;
     line: number;
     column: number;
-    e: RecognitionException | undefined;
+    e: Error | undefined;
     constructor(message: string, args: {
         recognizer: Recognizer<any>;
         offendingSymbol?: any;
         line: number;
         column: number;
-        e: RecognitionException | undefined;
+        e: Error | undefined;
     });
 }

package/types/filter/opra-error-listener.d.ts

@@ -1,5 +1,4 @@
-import { ErrorListener, RecognitionException } from '@browsery/antlr4';
-import { Recognizer } from '@browsery/antlr4/typings/Recognizer';
+import { ErrorListener, RecognitionException, Recognizer } from '@browsery/antlr4';
 import { FilterParseError } from './errors.js';
 export declare class OpraErrorListener extends ErrorListener<any> {
     errors: FilterParseError[];