using types

cblanquera · cblanquera · commit aef5f34722f1 · 2024-10-28T18:19:02.000+08:00
diff --git a/example/package.json b/example/package.json
@@ -1,14 +1,14 @@
 {
   "name": "with-node",
-  "version": "0.1.9",
+  "version": "1.0.0",
   "private": true,
   "scripts": {
     "transform": "idea",
     "build": "tsc"
   },
   "devDependencies": {
     "@types/node": "22.7.4",
-    "@stackpress/idea": "0.1.9",
+    "@stackpress/idea": "0.1.10",
     "ts-morph": "23.0.0",
     "ts-node": "10.9.1",
     "typescript": "5.6.2"
diff --git a/packages/idea-language/client/package.json b/packages/idea-language/client/package.json
@@ -3,7 +3,7 @@
 	"description": "Implementation of idea language server in node.",
 	"author": "Chris <chris@incept.asia>",
   "license": "Apache-2.0",
-	"version": "0.1.9",
+	"version": "0.1.10",
 	"publisher": "stackpress",
 	"repository": {
 		"type": "git",
diff --git a/packages/idea-language/package-lock.json b/packages/idea-language/package-lock.json
diff --git a/packages/idea-language/package.json b/packages/idea-language/package.json
@@ -2,7 +2,7 @@
 	"name": "idea-schema",
 	"displayName": "Idea Schema",
 	"description": "Adds syntax highlighting, formatting, auto-completion, jump-to-definition and linting for .idea files.",
-	"version": "0.1.9",
+	"version": "0.1.10",
   "license": "Apache-2.0",
 	"icon": "idea.png",
 	"repository": {
@@ -74,7 +74,7 @@
 		"test": "sh ./scripts/e2e.sh"
 	},
 	"dependencies": {
-		"@stackpress/idea-parser": "0.1.9"
+		"@stackpress/idea-parser": "0.1.10"
 	},
 	"devDependencies": {
 		"@types/mocha": "^9.1.0",
diff --git a/packages/idea-language/server/package.json b/packages/idea-language/server/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "idea-language-server",
 	"description": "Implementation of idea language server in node.",
-	"version": "0.1.9",
+	"version": "0.1.10",
 	"author": "Chris <chris@incept.asia>",
   "license": "Apache-2.0",
 	"engines": {
@@ -12,7 +12,7 @@
 		"url": "https://github.com/stackpress/idea"
 	},
 	"dependencies": {
-		"@stackpress/idea-parser": "0.1.9",
+		"@stackpress/idea-parser": "0.1.10",
 		"vscode-languageserver": "8.1.0",
 		"vscode-languageserver-textdocument": "1.0.8"
 	}
diff --git a/packages/idea-parser/package.json b/packages/idea-parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@stackpress/idea-parser",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "license": "Apache-2.0",
   "description": "Parses ideas to AST and readable JSON.",
   "author": "Chris <chris@incept.asia>",
@@ -9,12 +9,21 @@
   "repository": "stackpress/idea",
   "main": "index.js",
   "types": "index.d.ts",
+  "files": [
+    "dist",
+    "index.js",
+    "index.d.ts",
+    "LICENSE",
+    "README.md",
+    "tsconfig.json"
+  ],
   "scripts": {
-    "build": "npm run build:tsc && npm run build:files",
-    "build:tsc": "tsc",
-    "build:files": "cp ./README.md ./dist/ && cp ./package.json ./dist/ && cp ./LICENSE ./dist/",
+    "build": "tsc",
     "test": "nyc cross-env DATABASE_URL=test ts-mocha tests/*.test.ts"
   },
+  "dependencies": {
+    "@stackpress/types": "0.1.2"
+  },
   "devDependencies": {
     "@types/chai": "4.3.5",
     "@types/deep-equal-in-any-order": "1.0.1",
@@ -27,7 +36,7 @@
     "mocha": "10.2.0",
     "nyc": "15.1.0",
     "ts-mocha": "10.0.0",
-    "ts-morph": "22.0.0",
+    "ts-morph": "23.0.0",
     "ts-node": "10.9.2",
     "typescript": "5.6.2"
   }
diff --git a/packages/idea-parser/src/Compiler.ts b/packages/idea-parser/src/Compiler.ts
@@ -18,7 +18,7 @@ import type {
   IdentifierToken, 
   DeclarationToken,
   FinalSchemaConfig
-} from '../types';
+} from './types';
 
 import Exception from './Exception';
 
diff --git a/packages/idea-parser/src/Exception.ts b/packages/idea-parser/src/Exception.ts
@@ -0,0 +1,3 @@
+import Exception from '@stackpress/types/dist/Exception';
+
+export default class IdeaException extends Exception {}
diff --git a/packages/idea-parser/src/Lexer.ts b/packages/idea-parser/src/Lexer.ts
@@ -1,5 +1,5 @@
 //types
-import type { Definition, Reader, Parser, Token } from '../types';
+import type { Definition, Reader, Parser, Token } from './types';
 
 import Exception from './Exception';
 
diff --git a/packages/idea-parser/src/definitions.ts b/packages/idea-parser/src/definitions.ts
@@ -25,7 +25,7 @@ const definitions: Record<string, Reader> = {
   ),
   'note': (code, index) => reader(
     '_Note', 
-    /^\/\*(?:(?!\*\/).)+\*\/$/s, 
+    /^\/\*(?:(?!\*\/).)+\*\/$/g, 
     code, 
     index
   ),
diff --git a/packages/idea-parser/src/index.ts b/packages/idea-parser/src/index.ts
@@ -1,13 +1,13 @@
-import Exception from './types/Exception';
-import Lexer from './types/Lexer';
-import Compiler from './types/Compiler';
 import AbstractTree from './trees/AbstractTree';
 import EnumTree from './trees/EnumTree';
 import PropTree from './trees/PropTree';
 import TypeTree from './trees/TypeTree';
 import ModelTree from './trees/ModelTree';
 import SchemaTree from './trees/SchemaTree';
 import PluginTree from './trees/PluginTree';
+import Exception from './Exception';
+import Lexer from './Lexer';
+import Compiler from './Compiler';
 
 export type * from './types';
 export { 
diff --git a/packages/idea-parser/src/trees/AbstractTree.ts b/packages/idea-parser/src/trees/AbstractTree.ts
@@ -1,7 +1,7 @@
 //types
 import type { DeclarationToken } from '../types';
 
-import Lexer from '../types/Lexer';
+import Lexer from '../Lexer';
 
 import definitions from '../definitions';
 
diff --git a/packages/idea-parser/src/trees/EnumTree.ts b/packages/idea-parser/src/trees/EnumTree.ts
@@ -6,7 +6,7 @@ import type {
   DeclarationToken 
 } from '../types';
 
-import Lexer from '../types/Lexer';
+import Lexer from '../Lexer';
 import { scalar, scan } from '../definitions';
 
 import AbstractTree from './AbstractTree';
diff --git a/packages/idea-parser/src/trees/ModelTree.ts b/packages/idea-parser/src/trees/ModelTree.ts
@@ -1,7 +1,7 @@
 //models
 import { DeclarationToken, IdentifierToken, PropertyToken } from '../types';
 
-import Lexer from '../types/Lexer';
+import Lexer from '../Lexer';
 import TypeTree from './TypeTree';
 
 import { scan } from '../definitions';
diff --git a/packages/idea-parser/src/trees/PluginTree.ts b/packages/idea-parser/src/trees/PluginTree.ts
@@ -5,7 +5,7 @@ import type {
   ObjectToken 
 } from '../types';
 
-import Lexer from '../types/Lexer';
+import Lexer from '../Lexer';
 import { scan } from '../definitions';
 
 import AbstractTree from './AbstractTree';
diff --git a/packages/idea-parser/src/trees/PropTree.ts b/packages/idea-parser/src/trees/PropTree.ts
@@ -4,7 +4,7 @@ import type {
   ObjectToken 
 } from '../types';
 
-import Lexer from '../types/Lexer';
+import Lexer from '../Lexer';
 import { scan } from '../definitions';
 
 import AbstractTree from './AbstractTree';
diff --git a/packages/idea-parser/src/trees/SchemaTree.ts b/packages/idea-parser/src/trees/SchemaTree.ts
@@ -5,8 +5,8 @@ import type {
   DeclarationToken 
 } from '../types';
 
-import Exception from '../types/Exception';
-import Lexer from '../types/Lexer';
+import Exception from '../Exception';
+import Lexer from '../Lexer';
 
 import AbstractTree from './AbstractTree';
 import EnumTree from './EnumTree';
diff --git a/packages/idea-parser/src/trees/TypeTree.ts b/packages/idea-parser/src/trees/TypeTree.ts
@@ -6,7 +6,7 @@ import type {
   PropertyToken 
 } from '../types';
 
-import Lexer from '../types/Lexer';
+import Lexer from '../Lexer';
 import { data, scan } from '../definitions';
 
 import AbstractTree from './AbstractTree';
diff --git a/packages/idea-parser/src/trees/UseTree.ts b/packages/idea-parser/src/trees/UseTree.ts
@@ -1,7 +1,7 @@
 //types
 import type { LiteralToken, ImportToken } from '../types';
 
-import Lexer from '../types/Lexer';
+import Lexer from '../Lexer';
 import { scan } from '../definitions';
 
 import AbstractTree from './AbstractTree';
diff --git a/packages/idea-parser/src/types/Exception.ts b/packages/idea-parser/src/types/Exception.ts
diff --git a/packages/idea-parser/tests/Lexer.test.ts b/packages/idea-parser/tests/Lexer.test.ts
@@ -7,8 +7,8 @@ import type {
 
 import { describe, it } from 'mocha';
 import { expect } from 'chai';
-import Lexer from '../src/types/Lexer';
-import Compiler from '../src/types/Compiler';
+import Lexer from '../src/Lexer';
+import Compiler from '../src/Compiler';
 import definitions, { data } from '../src/definitions';
 
 describe('Lexer/Compiler', () => {
diff --git a/packages/idea-parser/tests/Schema.test.ts b/packages/idea-parser/tests/Schema.test.ts
diff --git a/packages/idea-transformer/package.json b/packages/idea-transformer/package.json
diff --git a/packages/idea/package.json b/packages/idea/package.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import Exception from '@stackpress/types/dist/Exception';`
	`2`	`+`
	`3`	`+export default class IdeaException extends Exception {}`