Merge pull request #338 from codefori/cleanup/typings

Enhance type safety and error handling

Author: worksofliam

.gitignore

@@ -2,5 +2,4 @@ node_modules
 .vscode-test/
 *.vsix
 .DS_Store
-dist
-types
+dist

.vscodeignore

@@ -10,6 +10,5 @@ vsc-extension-quickstart.md
 media/main.png
 node_modules
 src
-types
 .github
 src/dsc.ts

package.json

@@ -40,7 +40,7 @@
     "vscode:prepublish": "rm -rf dist && npm run webpack && npm run dsc",
     "webpack": "vscd --clean && webpack --mode development",
     "webpack-dev": "vscd --clean && webpack --mode development",
-    "typings": "npx -p typescript tsc ./src/extension.ts --declaration --allowJs --emitDeclarationOnly --outDir types --esModuleInterop -t es2019 --moduleResolution node"
+    "typings": "npx -p typescript tsc ./src/extension.ts --excludeDirectories '**/node_modules' --allowJs --noEmit --esModuleInterop -t es2019 --moduleResolution node --skipLibCheck"
   },
   "contributes": {
     "configuration": [

src/aiProviders/context.ts

@@ -5,6 +5,7 @@ import Schemas, { AllSQLTypes, SQLType } from "../database/schemas";
 import Statement from "../database/statement";
 import { DB2_SYSTEM_PROMPT } from "./prompts";
 import { Db2ContextItems } from "./prompt";
+import { TableColumn, BasicSQLObject, ResolvedSqlObject } from "../types";
 
 export function canTalkToDb() {
   return JobManager.getSelection() !== undefined;

src/aiProviders/continue/listTablesContextProvider.ts

@@ -10,11 +10,10 @@ import * as vscode from "vscode";
 import Schemas from "../../database/schemas";
 import Table from "../../database/table";
 import {
-  buildSchemaDefinition,
-  getSqlContextItems
-} from "../context";
+  buildSchemaDefinition} from "../context";
 import Configuration from "../../configuration";
-import { Db2ContextItems, getContextItems } from "../prompt";
+import { getContextItems } from "../prompt";
+import { TableColumn, BasicSQLObject } from "../../types";
 
 const listDb2Table: ContextProviderDescription = {
   title: "list Db2i Tables",

src/database/callable.ts

@@ -1,8 +1,6 @@
 
-import vscode from "vscode"
 import { JobManager } from "../config";
-import { QueryOptions } from "@ibm/mapepire-js/dist/src/types";
-const {instance} = vscode.extensions.getExtension(`halcyontechltd.code-for-ibmi`).exports;
+import { SQLParm } from "../types";
 
 export type CallableType = "PROCEDURE"|"FUNCTION";
 export interface CallableRoutine {
@@ -46,7 +44,7 @@ export default class Callable {
     const results = await JobManager.runSQL<SQLParm>(
       [
         `SELECT * FROM QSYS2.SYSPARMS`,
-        `WHERE SPECIFIC_SCHEMA = ? AND ROW_TYPE in ('P', 'R') AND SPECIFIC_NAME in (${specificNames.map(n => `?`).join(`, `)})`,
+        `WHERE SPECIFIC_SCHEMA = ? AND ROW_TYPE in ('P', 'R') AND SPECIFIC_NAME in (${specificNames.map(() => `?`).join(`, `)})`,
         `ORDER BY ORDINAL_POSITION`
       ].join(` `),
       {

src/database/schemas.ts

@@ -2,6 +2,7 @@
 import path from "path";
 import { getInstance } from "../base";
 import { JobManager } from "../config";
+import { ResolvedSqlObject, BasicSQLObject } from "../types";
 
 export type SQLType = "schemas" | "tables" | "views" | "aliases" | "constraints" | "functions" | "variables" | "indexes" | "procedures" | "sequences" | "packages" | "triggers" | "types" | "logicals";
 export type PageData = { filter?: string, offset?: number, limit?: number };

src/database/table.ts

@@ -1,6 +1,7 @@
 
 import { JobManager } from "../config";
 import { getInstance } from "../base";
+import { TableColumn, CPYFOptions } from "../types";
 
 export default class Table {
   /**

src/database/view.ts

@@ -1,7 +1,6 @@
 
-import vscode from "vscode"
 import { JobManager } from "../config";
-import Statement from "./statement";
+import { TableColumn } from "../types";
 
 export default class View {
   static getColumns(schema: string, name: string): Promise<TableColumn[]> {

src/language/providers/completionProvider.ts

@@ -1,7 +1,6 @@
 import { CompletionItem, CompletionItemKind, languages } from "vscode";
 import { JobManager } from "../../config";
 import {
-  default as Database,
   SQLType,
 } from "../../database/schemas";
 import Statement from "../../database/statement";
@@ -14,6 +13,7 @@ import { isCallableType, getCallableParameters } from "./logic/callable";
 import { localAssistIsEnabled, remoteAssistIsEnabled } from "./logic/available";
 import { DbCache } from "./logic/cache";
 import { getSqlDocument } from "./logic/parse";
+import { TableColumn, BasicSQLObject } from "../../types";
 
 export interface CompletionType {
   order: string;