From d78df0517e0928dc56a88b38dbf6467f7d0a85f5 Mon Sep 17 00:00:00 2001 From: Forest Belton Date: Mon, 13 Sep 2021 19:41:27 -0400 Subject: [PATCH] Fix TypeScript build configuration --- .gitignore | 4 +- Makefile | 11 ++-- gbuoy.js | 2 + index.ts | 1 - lib/compile.ts | 9 +++ lib/main.ts | 9 +++ lib/parser.d.ts | 3 + parser.pegjs => lib/parser.pegjs | 0 package-lock.json | 13 ++++ package.json | 7 ++- tsconfig.json | 103 +++---------------------------- 11 files changed, 57 insertions(+), 105 deletions(-) create mode 100755 gbuoy.js delete mode 100644 index.ts create mode 100644 lib/compile.ts create mode 100644 lib/main.ts create mode 100644 lib/parser.d.ts rename parser.pegjs => lib/parser.pegjs (100%) diff --git a/.gitignore b/.gitignore index dd27862..ffe5e2c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ node_modules/ -gbuoy.js -parser.js +build/ +lib/parser.js diff --git a/Makefile b/Makefile index 90e2272..a9994fc 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,10 @@ -TSFILES := index.ts $(find lib -type f -name '*.ts') +TSFILES := $(find lib -type f -name '*.ts') -gbuoy.js: parser.js $(TSFILES) - ./node_modules/.bin/tsc --outFile $@ $(TSFILES) +.PHONY: build -parser.js: parser.pegjs +build: build/parser.js $(TSFILES) + ./node_modules/.bin/tsc + +build/parser.js: lib/parser.pegjs + mkdir -p build ./node_modules/.bin/peggy -o $@ $< diff --git a/gbuoy.js b/gbuoy.js new file mode 100755 index 0000000..2fa7046 --- /dev/null +++ b/gbuoy.js @@ -0,0 +1,2 @@ +#!/usr/bin/env node +require("./build/main.js"); diff --git a/index.ts b/index.ts deleted file mode 100644 index 06f320c..0000000 --- a/index.ts +++ /dev/null @@ -1 +0,0 @@ -console.log("Hello, world!"); \ No newline at end of file diff --git a/lib/compile.ts b/lib/compile.ts new file mode 100644 index 0000000..b5d41f4 --- /dev/null +++ b/lib/compile.ts @@ -0,0 +1,9 @@ +import { parse } from "./parser" + +export const compile = (source: string): string => { + // 1. Parse + const ast = parse(source) + console.log(ast) + + return "" +} diff --git a/lib/main.ts b/lib/main.ts new file mode 100644 index 0000000..9c7a4f6 --- /dev/null +++ b/lib/main.ts @@ -0,0 +1,9 @@ +import { compile } from "./compile" + +const output = compile(` +u8 x; + +x <- 1; +`) + +console.log(output) diff --git a/lib/parser.d.ts b/lib/parser.d.ts new file mode 100644 index 0000000..d559aee --- /dev/null +++ b/lib/parser.d.ts @@ -0,0 +1,3 @@ +export const SyntaxError: any; + +export function parse(input: string): any; diff --git a/parser.pegjs b/lib/parser.pegjs similarity index 100% rename from parser.pegjs rename to lib/parser.pegjs diff --git a/package-lock.json b/package-lock.json index f8d0f23..65b9694 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,9 @@ "name": "gbuoy", "version": "1.0.0", "license": "MIT", + "dependencies": { + "systemjs": "^6.10.3" + }, "devDependencies": { "peggy": "^1.2.0", "typescript": "^4.4.3" @@ -25,6 +28,11 @@ "node": ">=10" } }, + "node_modules/systemjs": { + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-6.10.3.tgz", + "integrity": "sha512-mXwfLJdaADqWg1J5+Z0bGQEdcXSe+ePPTfzffMB29aVls5cXveRl0vneSV/19t3SfuUBsAraLP8W/g5u9cmYXA==" + }, "node_modules/typescript": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz", @@ -46,6 +54,11 @@ "integrity": "sha512-PQ+NKpAobImfMprYQtc4Egmyi29bidRGEX0kKjCU5uuW09s0Cthwqhfy7mLkwcB4VcgacE5L/ZjruD/kOPCUUw==", "dev": true }, + "systemjs": { + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-6.10.3.tgz", + "integrity": "sha512-mXwfLJdaADqWg1J5+Z0bGQEdcXSe+ePPTfzffMB29aVls5cXveRl0vneSV/19t3SfuUBsAraLP8W/g5u9cmYXA==" + }, "typescript": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz", diff --git a/package.json b/package.json index e5bf7cd..f81782c 100644 --- a/package.json +++ b/package.json @@ -14,5 +14,8 @@ }, "author": "Forest Belton ", "license": "MIT", - "description": "A 'high-level' language for the Gameboy" -} \ No newline at end of file + "description": "A 'high-level' language for the Gameboy", + "bin": { + "gbuoy": "./gbuoy.js" + } +} diff --git a/tsconfig.json b/tsconfig.json index 83b5f57..63e2f3c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,100 +1,11 @@ { "compilerOptions": { - /* Visit https://aka.ms/tsconfig.json to read more about this file */ - - /* Projects */ - // "incremental": true, /* Enable incremental compilation */ - // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ - // "tsBuildInfoFile": "./", /* Specify the folder for .tsbuildinfo incremental compilation files. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects */ - // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ - // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ - - /* Language and Environment */ - "target": "es5", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ - // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ - // "jsx": "preserve", /* Specify what JSX code is generated. */ - // "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */ - // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ - // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h' */ - // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ - // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using `jsx: react-jsx*`.` */ - // "reactNamespace": "", /* Specify the object invoked for `createElement`. This only applies when targeting `react` JSX emit. */ - // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ - // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ - - /* Modules */ - "module": "commonjs", /* Specify what module code is generated. */ - // "rootDir": "./", /* Specify the root folder within your source files. */ - // "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */ - // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ - // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ - // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like `./node_modules/@types`. */ - // "types": [], /* Specify type package names to be included without being referenced in a source file. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "resolveJsonModule": true, /* Enable importing .json files */ - // "noResolve": true, /* Disallow `import`s, `require`s or ``s from expanding the number of files TypeScript should add to a project. */ - - /* JavaScript Support */ - // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the `checkJS` option to get errors from these files. */ - // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ - // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from `node_modules`. Only applicable with `allowJs`. */ - - /* Emit */ - // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ - // "declarationMap": true, /* Create sourcemaps for d.ts files. */ - // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ - // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ - // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If `declaration` is true, also designates a file that bundles all .d.ts output. */ - // "outDir": "./", /* Specify an output folder for all emitted files. */ - // "removeComments": true, /* Disable emitting comments. */ - // "noEmit": true, /* Disable emitting files from a compilation. */ - // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ - // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ - // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ - // "newLine": "crlf", /* Set the newline character for emitting files. */ - // "stripInternal": true, /* Disable emitting declarations that have `@internal` in their JSDoc comments. */ - // "noEmitHelpers": true, /* Disable generating custom helper functions like `__extends` in compiled output. */ - // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ - // "preserveConstEnums": true, /* Disable erasing `const enum` declarations in generated code. */ - // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ - - /* Interop Constraints */ - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ - // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ - "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */ - // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ - "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ - - /* Type Checking */ - "strict": true, /* Enable all strict type-checking options. */ - // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied `any` type.. */ - // "strictNullChecks": true, /* When type checking, take into account `null` and `undefined`. */ - // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ - // "strictBindCallApply": true, /* Check that the arguments for `bind`, `call`, and `apply` methods match the original function. */ - // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ - // "noImplicitThis": true, /* Enable error reporting when `this` is given the type `any`. */ - // "useUnknownInCatchVariables": true, /* Type catch clause variables as 'unknown' instead of 'any'. */ - // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ - // "noUnusedLocals": true, /* Enable error reporting when a local variables aren't read. */ - // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read */ - // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ - // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ - // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ - // "noUncheckedIndexedAccess": true, /* Include 'undefined' in index signature results */ - // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ - // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type */ - // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ - // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ - - /* Completeness */ - // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ - "skipLibCheck": true /* Skip type checking all .d.ts files. */ + "target": "es5", + "module": "commonjs", + "outDir": "./build", + "forceConsistentCasingInFileNames": true, + "sourceMap": true, + "strict": true, + "skipLibCheck": false } }