Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ console.log(codeAsString);

```ts
/** generated by
* - https://jsr.io/@narumincho/[email protected].1
* - https://jsr.io/@narumincho/[email protected].2
* Do not edit!
*
* @module
Expand Down
30 changes: 17 additions & 13 deletions collect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -548,20 +548,24 @@ const collectInStatement = (
usedNameSet: new Set(),
};

case "VariableDefinition":
return concatCollectData(
collectInExpr(
statement.variableDefinitionStatement.expr,
localVariableNameSetList,
typeParameterSetList,
rootScopeIdentifierSet,
),
collectInType(
statement.variableDefinitionStatement.type,
rootScopeIdentifierSet,
typeParameterSetList,
),
case "VariableDefinition": {
const exprCollectData = collectInExpr(
statement.variableDefinitionStatement.expr,
localVariableNameSetList,
typeParameterSetList,
rootScopeIdentifierSet,
);
return statement.variableDefinitionStatement.type
? concatCollectData(
exprCollectData,
collectInType(
statement.variableDefinitionStatement.type,
rootScopeIdentifierSet,
typeParameterSetList,
),
)
: exprCollectData;
}

case "FunctionDefinition": {
const parameterNameSet = new Set(
Expand Down
2 changes: 1 addition & 1 deletion data.ts
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ export type VariableDefinitionStatement = {
/**
* 変数の型
*/
readonly type: Type;
readonly type: Type | undefined;
/**
* 式
*/
Expand Down
2 changes: 1 addition & 1 deletion deno.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@narumincho/js-ts-code-generator",
"version": "0.8.1",
"version": "0.8.2",
"license": "MIT",
"exports": {
".": "./mod.ts",
Expand Down
45 changes: 40 additions & 5 deletions statement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import type {
IfStatement,
SetStatement,
Statement,
VariableDefinitionStatement,
Type,
} from "./data.ts";
import { identifierFromString } from "./identifier.ts";
import { type Identifier, identifierFromString } from "./identifier.ts";
import { callMethod } from "./expr.ts";

/**
Expand Down Expand Up @@ -60,15 +60,50 @@ const statementIf = (ifStatement: IfStatement): Statement => ({

export { statementIf as if };

/**
* ローカル変数定義
*/
export type VariableDefinitionStatementInput = {
/**
* 変数名
*/
readonly name: Identifier;
/**
* 変数の型
*
* @default {undefined}
*/
readonly type?: Type | undefined;
/**
* 式
*/
readonly expr: Expr;
/**
* constかどうか. falseはlet
*
* @default {true}
*/
readonly isConst?: boolean;
};

/**
* 変数定義文 `const name = expr;` または `let name = expr;`
* @param variableDefinitionStatement 変数定義文のデータ
*/
export const variableDefinition = (
variableDefinitionStatement: VariableDefinitionStatement,
{
name,
type = undefined,
expr,
isConst = true,
}: VariableDefinitionStatementInput,
): Statement => ({
type: "VariableDefinition",
variableDefinitionStatement,
variableDefinitionStatement: {
name,
type,
expr,
isConst,
},
});

/**
Expand Down
4 changes: 2 additions & 2 deletions test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,7 @@ Deno.test("read me code", () => {
codeType: "TypeScript",
}),
`/** generated by
* - https://jsr.io/@narumincho/[email protected].1
* - https://jsr.io/@narumincho/[email protected].2
* Do not edit!
*
* @module
Expand Down Expand Up @@ -1123,7 +1123,7 @@ Deno.test("import name", () => {
assertEquals(
codeAsString,
`/** generated by
* - https://jsr.io/@narumincho/[email protected].1
* - https://jsr.io/@narumincho/[email protected].2
* Do not edit!
*
* @module
Expand Down
10 changes: 6 additions & 4 deletions toString/statement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,12 @@ const statementToString = (
(statement.variableDefinitionStatement.isConst ? "const" : "let") +
" " +
statement.variableDefinitionStatement.name +
typeAnnotation(
statement.variableDefinitionStatement.type,
context,
) +
(statement.variableDefinitionStatement.type
? typeAnnotation(
statement.variableDefinitionStatement.type,
context,
)
: "") +
" = " +
exprToString(
statement.variableDefinitionStatement.expr,
Expand Down