update codebase

Author: dbwodlf3

package-lock.json

@@ -25,7 +25,8 @@
     "lit-html": "^2.0.0",
     "nodemon": "^2.0.22",
     "ts-jest": "^29.1.0",
-    "ts-node": "^10.9.1"
+    "ts-node": "^10.9.1",
+    "tslib": "^2.6.1"
   },
   "dependencies": {
     "@types/express": "^4.17.17",
@@ -51,4 +52,4 @@
     "coverageDirectory": "../coverage",
     "testEnvironment": "node"
   }
-}
+}

package.json

@@ -1,7 +1,13 @@
 import { TableDocument, TableFieldDocument } from "component/table";
+import { parseCommentTable } from "../../lib/parser/comment_parser";
+import { exampleStrings } from "../test/example/sql";
 
-let tableDoc = document.createElement('table-document');
+let tableDoc = document.createElement("table-document");
+
+let exampleInput = exampleStrings;
+
+let parsedData = parseCommentTable(exampleInput);
 
 console.log(tableDoc);
 
-console.log("-_-;;")
+console.log(parsedData);

src/client/src/client.ts

@@ -0,0 +1,64 @@
+export const exampleStrings = `
+CREATE DATABASE SqldocExampleDatabase DEFAULT CHARACTER SET = 'utf8' COLLATE= 'utf8_general_ci';
+use SqldocExampleDatabase;
+
+/**
+ * @table [InnoDB] User
+ * This table is user Table.
+ * This table is only for user. Never use in another service.
+ * Only Read. but Only write in User Service.
+ *
+ * @tableColumn {BIGINT UNSIGNED} [PRIMARY KEY, AUTO_INCREMENT]		id 
+ * This is just for clustred index. don't use for relation.
+ * later this database will be sharded.
+ *
+ * @tableColumn {TINYINT UNSIGNED} [DEFAULT=0] 						type
+ * 0 is Anonymous user.
+ * 1 is Authenticated user.
+ * 2 is Admin.
+ * 3 is Super Admin.
+ * @tableColumn {DATETIME} [DEFAULT=CURRENT_TIMESTAMP] 				joinDate
+ * Just signed date.
+ * @tableColumn {VARCHAR(64)} [UNIQUE, NOT NULL]			 		userEmail
+ * For resetting password.
+ * @tableColumn {VARCHAR(24)} [UNIQUE, NOT NULL] 					username 
+ * For login.
+ * @tableColumn {VARCHAR(24)} [NOT NULL] 							nickname
+ * For exposing to other.
+ * @tableColumn {VARCHAR(24)} [UNIQUE, NOT NULL] 					password
+ * This column is stored as encrypted value.
+*/
+CREATE TABLE \`User\`(
+	\`id\` BIGINT(24) UNSIGNED PRIMARY KEY AUTO_INCREMENT,
+	\`type\`   		TINYINT UNSIGNED NOT NULL DEFAULT 0,
+	\`joinDate\` 		DATETIME DEFAULT CURRENT_TIMESTAMP,
+	\`userEmail\` 	VARCHAR(64) UNIQUE NOT NULL
+	\`username\` 		VARCHAR(24) UNIQUE NOT NULL,
+	\`nickname\`		VARCHAR(24) NOT NULL,
+	\`password\`		VARCHAR(64) NOT NULL,
+) ENGINE = InnoDB;
+
+/**
+ * @table [InnoDB] Page
+ * This is for storing content written by User.
+ *
+ * @tableColumn {BIGINT UNSIGNED} [PRIMARY KEY, AUTO_INCREMENT]		id 
+ * This is just for clustred index. don't use for relation.
+ * later this database will be sharded.
+ * use userId with createDate instead of this.
+ * @tableColumn {BIGINT UNSIGNED} [FOREIGN KEY]						userId
+ * @tableColumn {DATETIME} [DEFAULT=CURRENT_TIMESTAMP] 				text
+ * @tableColumn {VARCHAR(24)} [UNIQUE, NOT NULL] 					createDate
+*/
+CREATE TABLE \`Page\`(
+	\`id\` 			BIGINT(24) UNSIGNED PRIMARY KEY AUTO_INCREMENT,
+	\`userId\`		BIGINT(24) UNSIGNED,
+	\`title\`			VARCHAR(24) NOT NULL,
+	\`text\`			TEXT default NULL,
+	\`createDate\` 	DATETIME DEFAULT CURRENT_TIMESTAMP
+
+	CONSTRAINT \`FK_Page_User\`
+		FOREIGN KEY(\`userId\`) REFERENCES User(\`id\`)
+	ON DELETE CASCADE
+) ENGINE = InnoDB;
+`;

src/client/test/example/sql.ts

@@ -1,5 +1,5 @@
-import fs from "fs";
-import path from "path";
+// import fs from "fs";
+// import path from "path";
 import {
     COMMENT_SYMBOL_LIST,
     ParsedCommentSymbol,
@@ -10,8 +10,8 @@ import {
     TableDocument,
 } from "./types/common";
 
-export function parseCommentTable(input: ParserInputParameter) {
-    const strings = getRawStrings(input);
+export function parseCommentTable(input: string) {
+    const strings = input;
     const comments: ParsedCommentSymbol[] = [];
 
     const result: TableDocument[] = [];
@@ -200,16 +200,3 @@ function prepareComments(inputString: string) {
 
     return _comments;
 }
-
-// Helper
-function getRawStrings(inputString: ParserInputParameter) {
-    if (inputString.inputFilePath) {
-        const filePath = path.resolve(
-            inputString.callerFilePath || "",
-            inputString.inputFilePath
-        );
-        return fs.readFileSync(filePath, "utf-8");
-    }
-
-    return inputString.inputText;
-}

src/lib/parser/comment_parser.ts

@@ -1,11 +1,29 @@
+import path from "path";
+import fs from "fs";
+import { ParserInputParameter } from "lib/parser/types/common";
 import { parseCommentTable } from "../../src/lib/parser/comment_parser";
 
+// Helper
+function getRawStrings(inputString: ParserInputParameter) {
+    if (inputString.inputFilePath) {
+        const filePath = path.resolve(
+            inputString.callerFilePath || "",
+            inputString.inputFilePath
+        );
+        return fs.readFileSync(filePath, "utf-8");
+    }
+
+    return inputString.inputText;
+}
+
 describe("Parsing SQL", () => {
     it("Should parse a sql file", async () => {
-        const parsed_table = parseCommentTable({
-            inputFilePath: "../example/sqls/table-example.sql",
-            callerFilePath: __dirname,
-        });
+        const parsed_table = parseCommentTable(
+            getRawStrings({
+                inputFilePath: "../example/sqls/table-example.sql",
+                callerFilePath: __dirname,
+            })!
+        );
 
         expect(parsed_table.length).toEqual(2);
     });

test/unit/parse-sql.spec.ts

@@ -13,7 +13,8 @@
         "esModuleInterop": true,
         "skipLibCheck": true,
         "forceConsistentCasingInFileNames": true,
-        "downlevelIteration": true
+        "downlevelIteration": true,
+        "importHelpers": true,
     },
     "include":["./**/*.ts"],
     "exclude": [