Skip to content
Snippets Groups Projects
Commit fa252a44 authored by ezsh's avatar ezsh
Browse files

Fix co-existance of TypeScript and JavaScript declarations

Rename the FC.d.ts to FC.ts to move it from the ambient to normal
context, thus making namespace declarations from the FC.ts to extend but
not overwrite "namespace" declarations from .js files in the TypeScript
AST.
parent 116e7764
Branches
Tags
1 merge request!6887Fix co-existance of TypeScript and JavaScript declarations
declare namespace App { /// <reference path="../js/002-config/fc-js-init.js" />
namespace App {
namespace Art {} namespace Art {}
namespace Corporate {} namespace Corporate {}
...@@ -262,7 +263,7 @@ declare namespace App { ...@@ -262,7 +263,7 @@ declare namespace App {
labelTagsClear: boolean; labelTagsClear: boolean;
} }
class Rule { declare interface Rule {
ID: string; ID: string;
name: string; name: string;
condition: RuleConditions; condition: RuleConditions;
...@@ -277,12 +278,12 @@ declare namespace App { ...@@ -277,12 +278,12 @@ declare namespace App {
namespace DOM { namespace DOM {
namespace Widgets { } namespace Widgets { }
function makeElement<K extends keyof HTMLElementTagNameMap>(tag: K, content: string | Node, classNames: string | string[]): HTMLElementTagNameMap[K]; declare function makeElement<K extends keyof HTMLElementTagNameMap>(tag: K, content: string | Node, classNames: string | string[]): HTMLElementTagNameMap[K];
function appendNewElement<K extends keyof HTMLElementTagNameMap>(tag: K, parent: ParentNode, content?: string | Node, classNames?: string | string[]): HTMLElementTagNameMap[K]; declare function appendNewElement<K extends keyof HTMLElementTagNameMap>(tag: K, parent: ParentNode, content?: string | Node, classNames?: string | string[]): HTMLElementTagNameMap[K];
} }
namespace View { } namespace View { }
namespace SlaveSummary { namespace SlaveSummary {
type AppendRenderer = (slave: App.Entity.SlaveState, parentNode: Node) => void; type AppendRenderer = (slave: FC.SlaveState, parentNode: Node) => void;
class AbbreviationState { class AbbreviationState {
clothes: number; clothes: number;
...@@ -561,7 +562,7 @@ declare namespace FC { ...@@ -561,7 +562,7 @@ declare namespace FC {
enum NoObject { enum NoObject {
Value = 0 Value = 0
}; }
type SlaveStateOrZero = SlaveState | NoObject; type SlaveStateOrZero = SlaveState | NoObject;
...@@ -570,4 +571,4 @@ declare namespace FC { ...@@ -570,4 +571,4 @@ declare namespace FC {
interface GameVariables extends DefaultGameStateVariables, ResetOnNGPVariables {} interface GameVariables extends DefaultGameStateVariables, ResetOnNGPVariables {}
} }
const V: FC.GameVariables; declare const V: FC.GameVariables;
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment