Merge pull request #457 from stasm/ts-syntax

(@fluent/syntax) Migrate to TypeScript

fluent-gecko/makefile

@@ -23,6 +23,7 @@ Fluent.jsm: $(SOURCES)
 	@echo -e " $(OK) $@ built"
 
 FluentSyntax.jsm: $(SOURCES)
+	$(MAKE) -sC ../fluent-syntax compile
 	@rollup $(CURDIR)/src/fluent_syntax.js \
 	    --config ./xpcom_config.js \
 	    --no-treeshake \

fluent-gecko/src/fluent_syntax.js

@@ -2,16 +2,17 @@
           comma-dangle: "off",
           no-labels: "off" */
 
-import {FluentParser} from "../../fluent-syntax/src/parser";
-import {FluentSerializer} from "../../fluent-syntax/src/serializer";
-import * as ast from "../../fluent-syntax/src/ast";
-import * as visitor from "../../fluent-syntax/src/visitor";
+import {FluentParser} from "../../fluent-syntax/esm/parser";
+import {FluentSerializer} from "../../fluent-syntax/esm/serializer";
+import {Visitor, Transformer} from "../../fluent-syntax/esm/visitor";
+import * as ast from "../../fluent-syntax/esm/ast";
 
 this.EXPORTED_SYMBOLS = [
+  ...Object.keys(ast),
   ...Object.keys({
     FluentParser,
     FluentSerializer,
+    Visitor,
+    Transformer
   }),
-  ...Object.keys(ast),
-  ...Object.keys(visitor),
 ];

fluent-syntax/.gitignore

@@ -1,2 +1,3 @@
+esm/
 /index.js
 /compat.js

fluent-syntax/.npmignore

@@ -1,5 +1,7 @@
 .nyc_output
 coverage
-docs
+esm/.compiled
+src
 test
 makefile
+tsconfig.json

fluent-syntax/makefile

@@ -3,35 +3,61 @@ GLOBAL  := FluentSyntax
 
 include ../common.mk
 
-test:
+lint:
+	@eslint --config $(ROOT)/eslint_ts.json --max-warnings 0 src/*.ts
+	@eslint --config $(ROOT)/eslint_test.json --max-warnings 0 test/
+	@echo -e " $(OK) lint"
+
+.PHONY: compile
+compile: esm/.compiled
+
+esm/.compiled: $(SOURCES)
+	@tsc
+	@touch $@
+	@echo -e " $(OK) esm/ compiled"
+
+.PHONY: test
+test: esm/.compiled
 	@nyc --reporter=text --reporter=html mocha \
 	    --recursive --ui tdd \
 	    --require esm \
 	    test/**/*_test.js
 
 build: index.js compat.js
 
-index.js: $(SOURCES)
-	@rollup $(CURDIR)/src/index.js \
+index.js: esm/.compiled
+	@rollup $(CURDIR)/esm/index.js \
 	    --config $(ROOT)/bundle_config.js \
 	    --banner "/* $(PACKAGE)@$(VERSION) */" \
 	    --amd.id $(PACKAGE) \
 	    --name $(GLOBAL) \
 	    --output.file $@
 	@echo -e " $(OK) $@ built"
 
-compat.js: $(SOURCES)
-	@rollup $(CURDIR)/src/index.js \
+compat.js: esm/.compiled
+	@rollup $(CURDIR)/esm/index.js \
 	    --config $(ROOT)/compat_config.js \
 	    --banner "/* $(PACKAGE)@$(VERSION) */" \
 	    --amd.id $(PACKAGE) \
 	    --name $(GLOBAL) \
 	    --output.file $@
 	@echo -e " $(OK) $@ built"
 
-lint: _lint
-html: _html
-clean: _clean
+html:
+	@typedoc src \
+	    --out ../html/syntax \
+	    --mode file \
+	    --excludeNotExported \
+	    --excludePrivate \
+	    --logger none \
+	    --hideGenerator
+	@echo -e " $(OK) html built"
+
+clean:
+	@rm -f esm/*.js esm/*.d.ts esm/.compiled
+	@rm -f index.js compat.js
+	@rm -rf .nyc_output coverage
+	@echo -e " $(OK) clean"
 
 STRUCTURE_FTL := $(wildcard test/fixtures_structure/*.ftl)
 STRUCTURE_AST := $(STRUCTURE_FTL:.ftl=.json)

fluent-syntax/package.json

@@ -15,11 +15,10 @@
       "email": "[email protected]"
     }
   ],
-  "directories": {
-    "lib": "./src"
-  },
+  "type": "commonjs",
   "main": "./index.js",
-  "module": "./src/index.js",
+  "module": "./esm/index.js",
+  "types": "./esm/index.d.ts",
   "repository": {
     "type": "git",
     "url": "https://github.com/projectfluent/fluent.js.git"