deepclause-sdk 0.0.58 → 0.0.59

package/dist/prolog-src/deepclause_mi.pl

@@ -2199,14 +2199,15 @@ flatten_conjunction((A1, A2), B, Result) :- !,
 flatten_conjunction(A, B, (A, B)).
 
 %% string_needs_interpolation(+String)
-%% Check if a string contains {VarName} patterns
+%% Check if a string contains identifier-like {VarName} patterns
 string_needs_interpolation(String) :-
     (   string(String) -> S = String
     ;   atom(String) -> atom_string(String, S)
     ;   fail
     ),
-    sub_string(S, _, _, _, "{"),
-    sub_string(S, _, _, _, "}").
+    string_codes(S, Codes),
+    extract_vars_from_codes(Codes, VarNames, _),
+    VarNames \= [].
 
 %% build_format_call(+Template, +Bindings, -TempVar, -FormatGoal)
 %% Build a format/3 call that produces the interpolated string
@@ -2247,11 +2248,17 @@ extract_interpolation_vars(Template, VarNames, FormatString) :-
 extract_vars_from_codes([], [], []) :- !.
 
 % Found opening brace
-extract_vars_from_codes([0'{|Rest], [VarName|VarNames], [0'~, 0'w|FormatRest]) :- !,
+extract_vars_from_codes([0'{|Rest], [VarName|VarNames], [0'~, 0'w|FormatRest]) :-
     extract_var_until_close(Rest, VarNameCodes, AfterClose),
+    valid_placeholder_codes(VarNameCodes),
+    !,
     atom_codes(VarName, VarNameCodes),
     extract_vars_from_codes(AfterClose, VarNames, FormatRest).
 
+% Invalid placeholder syntax - keep the opening brace literal
+extract_vars_from_codes([0'{|Rest], VarNames, [0'{|FormatRest]) :- !,
+    extract_vars_from_codes(Rest, VarNames, FormatRest).
+
 % Escape tilde for format/3
 extract_vars_from_codes([0'~|Rest], VarNames, [0'~, 0'~|FormatRest]) :- !,
     extract_vars_from_codes(Rest, VarNames, FormatRest).
@@ -2266,6 +2273,20 @@ extract_var_until_close([C|Rest], [C|VarRest], Final) :-
     extract_var_until_close(Rest, VarRest, Final).
 extract_var_until_close([], [], []).
 
+%% valid_placeholder_codes(+Codes)
+%% Placeholder names must look like identifiers: [A-Za-z_][A-Za-z0-9_]*
+valid_placeholder_codes([First|Rest]) :-
+    valid_placeholder_start(First),
+    maplist(valid_placeholder_char, Rest).
+
+valid_placeholder_start(Code) :-
+    code_type(Code, alpha)
+    ; Code =:= 0'_.
+
+valid_placeholder_char(Code) :-
+    code_type(Code, alnum)
+    ; Code =:= 0'_.
+
 %% lookup_vars_with_params(+VarNames, +Bindings, -VarList, -ParamGoals)
 %% Look up each variable name:
 %% - If in Bindings (local Prolog variable) → use directly

package/dist/prolog-src/deepclause_strings.pl

@@ -36,10 +36,11 @@ interpolate_atom(Template, Bindings, Result) :-
 %% Process character codes, replacing {var} patterns
 interpolate_codes([], _, []) :- !.
 
-% Found opening brace - extract variable name
+% Found opening brace - replace only identifier-like placeholders
 interpolate_codes([0'{|Rest], Bindings, Result) :-
-    !,
     extract_var_name(Rest, VarNameCodes, AfterVar),
+    valid_placeholder_codes(VarNameCodes),
+    !,
     atom_codes(VarName, VarNameCodes),
     (   find_binding(VarName, Bindings, Value)
     ->  format(atom(ValueAtom), '~w', [Value]),
@@ -51,6 +52,11 @@ interpolate_codes([0'{|Rest], Bindings, Result) :-
         append([0'{|VarNameCodes], [0'}|RestResult], Result)
     ).
 
+% Invalid placeholder syntax - keep the opening brace literal
+interpolate_codes([0'{|Rest], Bindings, [0'{|Result]) :-
+    !,
+    interpolate_codes(Rest, Bindings, Result).
+
 % Regular character - keep it
 interpolate_codes([C|Rest], Bindings, [C|Result]) :-
     interpolate_codes(Rest, Bindings, Result).
@@ -63,6 +69,20 @@ extract_var_name([C|Rest], [C|VarRest], Final) :-
     extract_var_name(Rest, VarRest, Final).
 extract_var_name([], [], []).  % Handle unclosed brace gracefully
 
+%% valid_placeholder_codes(+Codes)
+%% Placeholder names must look like identifiers: [A-Za-z_][A-Za-z0-9_]*
+valid_placeholder_codes([First|Rest]) :-
+    valid_placeholder_start(First),
+    maplist(valid_placeholder_char, Rest).
+
+valid_placeholder_start(Code) :-
+    code_type(Code, alpha)
+    ; Code =:= 0'_.
+
+valid_placeholder_char(Code) :-
+    code_type(Code, alnum)
+    ; Code =:= 0'_.
+
 %% find_binding(+VarName, +Bindings, -Value)
 %% Look up a variable in the bindings list
 find_binding(VarName, Bindings, Value) :-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepclause-sdk",
-  "version": "0.0.58",
+  "version": "0.0.59",
   "description": "DeepClause CLI Tool and Typescript SDK",
   "type": "module",
   "main": "dist/index.js",

package/src/prolog-src/deepclause_mi.pl

@@ -2199,14 +2199,15 @@ flatten_conjunction((A1, A2), B, Result) :- !,
 flatten_conjunction(A, B, (A, B)).
 
 %% string_needs_interpolation(+String)
-%% Check if a string contains {VarName} patterns
+%% Check if a string contains identifier-like {VarName} patterns
 string_needs_interpolation(String) :-
     (   string(String) -> S = String
     ;   atom(String) -> atom_string(String, S)
     ;   fail
     ),
-    sub_string(S, _, _, _, "{"),
-    sub_string(S, _, _, _, "}").
+    string_codes(S, Codes),
+    extract_vars_from_codes(Codes, VarNames, _),
+    VarNames \= [].
 
 %% build_format_call(+Template, +Bindings, -TempVar, -FormatGoal)
 %% Build a format/3 call that produces the interpolated string
@@ -2247,11 +2248,17 @@ extract_interpolation_vars(Template, VarNames, FormatString) :-
 extract_vars_from_codes([], [], []) :- !.
 
 % Found opening brace
-extract_vars_from_codes([0'{|Rest], [VarName|VarNames], [0'~, 0'w|FormatRest]) :- !,
+extract_vars_from_codes([0'{|Rest], [VarName|VarNames], [0'~, 0'w|FormatRest]) :-
     extract_var_until_close(Rest, VarNameCodes, AfterClose),
+    valid_placeholder_codes(VarNameCodes),
+    !,
     atom_codes(VarName, VarNameCodes),
     extract_vars_from_codes(AfterClose, VarNames, FormatRest).
 
+% Invalid placeholder syntax - keep the opening brace literal
+extract_vars_from_codes([0'{|Rest], VarNames, [0'{|FormatRest]) :- !,
+    extract_vars_from_codes(Rest, VarNames, FormatRest).
+
 % Escape tilde for format/3
 extract_vars_from_codes([0'~|Rest], VarNames, [0'~, 0'~|FormatRest]) :- !,
     extract_vars_from_codes(Rest, VarNames, FormatRest).
@@ -2266,6 +2273,20 @@ extract_var_until_close([C|Rest], [C|VarRest], Final) :-
     extract_var_until_close(Rest, VarRest, Final).
 extract_var_until_close([], [], []).
 
+%% valid_placeholder_codes(+Codes)
+%% Placeholder names must look like identifiers: [A-Za-z_][A-Za-z0-9_]*
+valid_placeholder_codes([First|Rest]) :-
+    valid_placeholder_start(First),
+    maplist(valid_placeholder_char, Rest).
+
+valid_placeholder_start(Code) :-
+    code_type(Code, alpha)
+    ; Code =:= 0'_.
+
+valid_placeholder_char(Code) :-
+    code_type(Code, alnum)
+    ; Code =:= 0'_.
+
 %% lookup_vars_with_params(+VarNames, +Bindings, -VarList, -ParamGoals)
 %% Look up each variable name:
 %% - If in Bindings (local Prolog variable) → use directly

package/src/prolog-src/deepclause_strings.pl

@@ -36,10 +36,11 @@ interpolate_atom(Template, Bindings, Result) :-
 %% Process character codes, replacing {var} patterns
 interpolate_codes([], _, []) :- !.
 
-% Found opening brace - extract variable name
+% Found opening brace - replace only identifier-like placeholders
 interpolate_codes([0'{|Rest], Bindings, Result) :-
-    !,
     extract_var_name(Rest, VarNameCodes, AfterVar),
+    valid_placeholder_codes(VarNameCodes),
+    !,
     atom_codes(VarName, VarNameCodes),
     (   find_binding(VarName, Bindings, Value)
     ->  format(atom(ValueAtom), '~w', [Value]),
@@ -51,6 +52,11 @@ interpolate_codes([0'{|Rest], Bindings, Result) :-
         append([0'{|VarNameCodes], [0'}|RestResult], Result)
     ).
 
+% Invalid placeholder syntax - keep the opening brace literal
+interpolate_codes([0'{|Rest], Bindings, [0'{|Result]) :-
+    !,
+    interpolate_codes(Rest, Bindings, Result).
+
 % Regular character - keep it
 interpolate_codes([C|Rest], Bindings, [C|Result]) :-
     interpolate_codes(Rest, Bindings, Result).
@@ -63,6 +69,20 @@ extract_var_name([C|Rest], [C|VarRest], Final) :-
     extract_var_name(Rest, VarRest, Final).
 extract_var_name([], [], []).  % Handle unclosed brace gracefully
 
+%% valid_placeholder_codes(+Codes)
+%% Placeholder names must look like identifiers: [A-Za-z_][A-Za-z0-9_]*
+valid_placeholder_codes([First|Rest]) :-
+    valid_placeholder_start(First),
+    maplist(valid_placeholder_char, Rest).
+
+valid_placeholder_start(Code) :-
+    code_type(Code, alpha)
+    ; Code =:= 0'_.
+
+valid_placeholder_char(Code) :-
+    code_type(Code, alnum)
+    ; Code =:= 0'_.
+
 %% find_binding(+VarName, +Bindings, -Value)
 %% Look up a variable in the bindings list
 find_binding(VarName, Bindings, Value) :-